From badb1d9d5e587564e32270237147acceab46f918 Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Sun, 31 Jan 2021 23:38:23 +0000 Subject: [PATCH] ovl_Demo_Kankyo OK (#608) * Decompiled, not yet matched * Another match * Fix merge * OK * Move cutscene data to separate source files, name some functions and variables * Small cleanup * Some docs * Small improvements * Struct_Unk_150 -> DemoKankyo_Unk_150 * Review Suggestions Co-authored-by: mzxrules Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review changes * rm reloc asm Co-authored-by: Thar0 Co-authored-by: mzxrules Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> --- .../ovl_Demo_Kankyo/DemoKankyo_Destroy.s | 3 - .../actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s | 147 --- .../actors/ovl_Demo_Kankyo/DemoKankyo_Init.s | 333 ------ .../ovl_Demo_Kankyo/DemoKankyo_Update.s | 10 - .../actors/ovl_Demo_Kankyo/func_80988E80.s | 3 - .../actors/ovl_Demo_Kankyo/func_809892A4.s | 324 ------ .../actors/ovl_Demo_Kankyo/func_809896DC.s | 4 - .../actors/ovl_Demo_Kankyo/func_809896E8.s | 11 - .../actors/ovl_Demo_Kankyo/func_80989710.s | 61 -- .../actors/ovl_Demo_Kankyo/func_80989800.s | 33 - .../actors/ovl_Demo_Kankyo/func_8098987C.s | 21 - .../actors/ovl_Demo_Kankyo/func_809898C8.s | 43 - .../actors/ovl_Demo_Kankyo/func_80989960.s | 12 - .../actors/ovl_Demo_Kankyo/func_80989B54.s | 128 --- .../actors/ovl_Demo_Kankyo/func_80989D24.s | 453 -------- .../actors/ovl_Demo_Kankyo/func_8098A36C.s | 120 --- .../actors/ovl_Demo_Kankyo/func_8098A4F0.s | 236 ----- .../actors/ovl_Demo_Kankyo/func_8098A854.s | 103 -- .../actors/ovl_Demo_Kankyo/func_8098A9A4.s | 90 -- .../actors/ovl_Demo_Kankyo/func_8098AAC8.s | 8 - .../actors/ovl_Demo_Kankyo/func_8098AAE4.s | 34 - .../actors/ovl_Demo_Kankyo/func_8098AB68.s | 23 - .../actors/ovl_Demo_Kankyo/func_8098ABC0.s | 547 ---------- .../actors/ovl_Demo_Kankyo/func_8098B354.s | 417 -------- data/overlays/actors/z_demo_kankyo.bss.s | 38 - data/overlays/actors/z_demo_kankyo.data.s | 46 - data/overlays/actors/z_demo_kankyo.reloc.s | 13 - include/z64cutscene_commands.h | 4 +- spec | 12 +- .../actors/ovl_Demo_Kankyo/overlay.cfg | 10 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 983 +++++++++++++++++- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.h | 40 +- .../z_demo_kankyo_cutscene_data1.c | 25 + .../z_demo_kankyo_cutscene_data2.c | 31 + .../z_demo_kankyo_cutscene_data3.c | 25 + .../z_demo_kankyo_cutscene_data4.c | 25 + .../z_demo_kankyo_cutscene_data5.c | 27 + .../z_demo_kankyo_cutscene_data6.c | 31 + .../z_demo_kankyo_cutscene_data7.c | 27 + .../z_demo_kankyo_cutscene_data8.c | 25 + 40 files changed, 1226 insertions(+), 3300 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s delete mode 100644 data/overlays/actors/z_demo_kankyo.bss.s delete mode 100644 data/overlays/actors/z_demo_kankyo.data.s delete mode 100644 data/overlays/actors/z_demo_kankyo.reloc.s create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c create mode 100644 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s deleted file mode 100644 index ff781f5503..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel DemoKankyo_Destroy -/* 0041C 8098929C 03E00008 */ jr $ra -/* 00420 809892A0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s deleted file mode 100644 index 8e30619e48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s +++ /dev/null @@ -1,147 +0,0 @@ -.late_rodata -glabel jtbl_8098CAE4 -.word L809899F8 -.word L809899F8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989ABC -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989AD0 -.word L80989AE4 -.word L80989AF8 -.word L80989AF8 -.word L80989B0C - -.text -glabel DemoKankyo_Draw -/* 00B2C 809899AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B30 809899B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B34 809899B4 AFB10018 */ sw $s1, 0x0018($sp) -/* 00B38 809899B8 AFB00014 */ sw $s0, 0x0014($sp) -/* 00B3C 809899BC 808E001E */ lb $t6, 0x001E($a0) ## 0000001E -/* 00B40 809899C0 9086014C */ lbu $a2, 0x014C($a0) ## 0000014C -/* 00B44 809899C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B48 809899C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B4C 809899CC 54CE0054 */ bnel $a2, $t6, .L80989B20 -/* 00B50 809899D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B54 809899D4 948F001C */ lhu $t7, 0x001C($a0) ## 0000001C -/* 00B58 809899D8 2DE10012 */ sltiu $at, $t7, 0x0012 -/* 00B5C 809899DC 1020004F */ beq $at, $zero, .L80989B1C -/* 00B60 809899E0 000F7880 */ sll $t7, $t7, 2 -/* 00B64 809899E4 3C018099 */ lui $at, %hi(jtbl_8098CAE4) ## $at = 80990000 -/* 00B68 809899E8 002F0821 */ addu $at, $at, $t7 -/* 00B6C 809899EC 8C2FCAE4 */ lw $t7, %lo(jtbl_8098CAE4)($at) -/* 00B70 809899F0 01E00008 */ jr $t7 -/* 00B74 809899F4 00000000 */ nop -glabel L809899F8 -/* 00B78 809899F8 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 -/* 00B7C 809899FC 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 00B80 80989A00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B84 80989A04 57010024 */ bnel $t8, $at, .L80989A98 -/* 00B88 80989A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B8C 80989A0C 0C01B129 */ jal Flags_GetEnv -/* 00B90 80989A10 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00B94 80989A14 14400003 */ bne $v0, $zero, .L80989A24 -/* 00B98 80989A18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B9C 80989A1C 1000003F */ beq $zero, $zero, .L80989B1C -/* 00BA0 80989A20 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -.L80989A24: -/* 00BA4 80989A24 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 00BA8 80989A28 0C00B84B */ jal func_8002E12C -/* 00BAC 80989A2C 24067530 */ addiu $a2, $zero, 0x7530 ## $a2 = 00007530 -/* 00BB0 80989A30 14400003 */ bne $v0, $zero, .L80989A40 -/* 00BB4 80989A34 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 00BB8 80989A38 10000038 */ beq $zero, $zero, .L80989B1C -/* 00BBC 80989A3C 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -.L80989A40: -/* 00BC0 80989A40 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 00BC4 80989A44 5320000B */ beql $t9, $zero, .L80989A74 -/* 00BC8 80989A48 962A1D74 */ lhu $t2, 0x1D74($s1) ## 00001D74 -/* 00BCC 80989A4C 96281D74 */ lhu $t0, 0x1D74($s1) ## 00001D74 -/* 00BD0 80989A50 290100AA */ slti $at, $t0, 0x00AA -/* 00BD4 80989A54 14200004 */ bne $at, $zero, .L80989A68 -/* 00BD8 80989A58 00000000 */ nop -/* 00BDC 80989A5C 92291D6C */ lbu $t1, 0x1D6C($s1) ## 00001D6C -/* 00BE0 80989A60 5520000D */ bnel $t1, $zero, .L80989A98 -/* 00BE4 80989A64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80989A68: -/* 00BE8 80989A68 1000002C */ beq $zero, $zero, .L80989B1C -/* 00BEC 80989A6C 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -/* 00BF0 80989A70 962A1D74 */ lhu $t2, 0x1D74($s1) ## 00001D74 -.L80989A74: -/* 00BF4 80989A74 29410078 */ slti $at, $t2, 0x0078 -/* 00BF8 80989A78 14200004 */ bne $at, $zero, .L80989A8C -/* 00BFC 80989A7C 00000000 */ nop -/* 00C00 80989A80 922B1D6C */ lbu $t3, 0x1D6C($s1) ## 00001D6C -/* 00C04 80989A84 55600004 */ bnel $t3, $zero, .L80989A98 -/* 00C08 80989A88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80989A8C: -/* 00C0C 80989A8C 10000023 */ beq $zero, $zero, .L80989B1C -/* 00C10 80989A90 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -/* 00C14 80989A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80989A98: -/* 00C18 80989A98 0C262749 */ jal func_80989D24 -/* 00C1C 80989A9C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C20 80989AA0 1000001E */ beq $zero, $zero, .L80989B1C -/* 00C24 80989AA4 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AA8 -/* 00C28 80989AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C2C 80989AAC 0C2628DB */ jal func_8098A36C -/* 00C30 80989AB0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C34 80989AB4 10000019 */ beq $zero, $zero, .L80989B1C -/* 00C38 80989AB8 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989ABC -/* 00C3C 80989ABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C40 80989AC0 0C26293C */ jal func_8098A4F0 -/* 00C44 80989AC4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C48 80989AC8 10000014 */ beq $zero, $zero, .L80989B1C -/* 00C4C 80989ACC 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AD0 -/* 00C50 80989AD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C54 80989AD4 0C262A15 */ jal func_8098A854 -/* 00C58 80989AD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C5C 80989ADC 1000000F */ beq $zero, $zero, .L80989B1C -/* 00C60 80989AE0 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AE4 -/* 00C64 80989AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C68 80989AE8 0C262A69 */ jal func_8098A9A4 -/* 00C6C 80989AEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C70 80989AF0 1000000A */ beq $zero, $zero, .L80989B1C -/* 00C74 80989AF4 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AF8 -/* 00C78 80989AF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C7C 80989AFC 0C262AF0 */ jal func_8098ABC0 -/* 00C80 80989B00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C84 80989B04 10000005 */ beq $zero, $zero, .L80989B1C -/* 00C88 80989B08 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989B0C -/* 00C8C 80989B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C90 80989B10 0C262CD5 */ jal func_8098B354 -/* 00C94 80989B14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C98 80989B18 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989B1C -.L80989B1C: -/* 00C9C 80989B1C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80989B20: -/* 00CA0 80989B20 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00CA4 80989B24 02212021 */ addu $a0, $s1, $at -/* 00CA8 80989B28 0C026062 */ jal Object_IsLoaded - -/* 00CAC 80989B2C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00CB0 80989B30 50400004 */ beql $v0, $zero, .L80989B44 -/* 00CB4 80989B34 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CB8 80989B38 920C014C */ lbu $t4, 0x014C($s0) ## 0000014C -/* 00CBC 80989B3C A20C001E */ sb $t4, 0x001E($s0) ## 0000001E -/* 00CC0 80989B40 8FBF001C */ lw $ra, 0x001C($sp) -.L80989B44: -/* 00CC4 80989B44 8FB00014 */ lw $s0, 0x0014($sp) -/* 00CC8 80989B48 8FB10018 */ lw $s1, 0x0018($sp) -/* 00CCC 80989B4C 03E00008 */ jr $ra -/* 00CD0 80989B50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s deleted file mode 100644 index 63904794a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s +++ /dev/null @@ -1,333 +0,0 @@ -.rdata -glabel D_8098C870 - .asciz "bank_ID = %d\n" - .balign 4 - -glabel D_8098C880 - .asciz "0" - .balign 4 - -glabel D_8098C884 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel jtbl_8098CA50 -.word L80988F2C -.word L80988F2C -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L8098906C -.word L80989244 -.word L80989244 -.word L80989244 -.word L80989244 -.word L80989244 -.word L809890DC -.word L8098916C -.word L80989190 -.word L80989190 -.word L8098921C -glabel D_8098CA98 - .word 0x477FFF00 - -.text -glabel DemoKankyo_Init -/* 00008 80988E88 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0000C 80988E8C AFB30040 */ sw $s3, 0x0040($sp) -/* 00010 80988E90 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 00014 80988E94 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00018 80988E98 AFB2003C */ sw $s2, 0x003C($sp) -/* 0001C 80988E9C AFB10038 */ sw $s1, 0x0038($sp) -/* 00020 80988EA0 AFB00034 */ sw $s0, 0x0034($sp) -/* 00024 80988EA4 866E001C */ lh $t6, 0x001C($s3) ## 0000001C -/* 00028 80988EA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0002C 80988EAC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00030 80988EB0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00034 80988EB4 00A12021 */ addu $a0, $a1, $at -/* 00038 80988EB8 3C058099 */ lui $a1, %hi(D_8098C2F0) ## $a1 = 80990000 -/* 0003C 80988EBC 000E7840 */ sll $t7, $t6, 1 -/* 00040 80988EC0 00AF2821 */ addu $a1, $a1, $t7 -/* 00044 80988EC4 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00048 80988EC8 84A5C2F0 */ lh $a1, %lo(D_8098C2F0)($a1) -/* 0004C 80988ECC 3C048099 */ lui $a0, %hi(D_8098C870) ## $a0 = 80990000 -/* 00050 80988ED0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 00054 80988ED4 2484C870 */ addiu $a0, $a0, %lo(D_8098C870) ## $a0 = 8098C870 -/* 00058 80988ED8 0C00084C */ jal osSyncPrintf - -/* 0005C 80988EDC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00060 80988EE0 06210008 */ bgez $s1, .L80988F04 -/* 00064 80988EE4 24060209 */ addiu $a2, $zero, 0x0209 ## $a2 = 00000209 -/* 00068 80988EE8 3C048099 */ lui $a0, %hi(D_8098C880) ## $a0 = 80990000 -/* 0006C 80988EEC 3C058099 */ lui $a1, %hi(D_8098C884) ## $a1 = 80990000 -/* 00070 80988EF0 24A5C884 */ addiu $a1, $a1, %lo(D_8098C884) ## $a1 = 8098C884 -/* 00074 80988EF4 0C0007FC */ jal __assert - -/* 00078 80988EF8 2484C880 */ addiu $a0, $a0, %lo(D_8098C880) ## $a0 = 8098C880 -/* 0007C 80988EFC 10000003 */ beq $zero, $zero, .L80988F0C -/* 00080 80988F00 9678001C */ lhu $t8, 0x001C($s3) ## 0000001C -.L80988F04: -/* 00084 80988F04 A271014C */ sb $s1, 0x014C($s3) ## 0000014C -/* 00088 80988F08 9678001C */ lhu $t8, 0x001C($s3) ## 0000001C -.L80988F0C: -/* 0008C 80988F0C 2F010012 */ sltiu $at, $t8, 0x0012 -/* 00090 80988F10 102000CC */ beq $at, $zero, .L80989244 -/* 00094 80988F14 0018C080 */ sll $t8, $t8, 2 -/* 00098 80988F18 3C018099 */ lui $at, %hi(jtbl_8098CA50) ## $at = 80990000 -/* 0009C 80988F1C 00380821 */ addu $at, $at, $t8 -/* 000A0 80988F20 8C38CA50 */ lw $t8, %lo(jtbl_8098CA50)($at) -/* 000A4 80988F24 03000008 */ jr $t8 -/* 000A8 80988F28 00000000 */ nop -glabel L80988F2C -/* 000AC 80988F2C 860200A4 */ lh $v0, 0x00A4($s0) ## 000000A4 -/* 000B0 80988F30 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 000B4 80988F34 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 000B8 80988F38 10410013 */ beq $v0, $at, .L80988F88 -/* 000BC 80988F3C 240A0008 */ addiu $t2, $zero, 0x0008 ## $t2 = 00000008 -/* 000C0 80988F40 24010047 */ addiu $at, $zero, 0x0047 ## $at = 00000047 -/* 000C4 80988F44 10410006 */ beq $v0, $at, .L80988F60 -/* 000C8 80988F48 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 000CC 80988F4C 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 000D0 80988F50 10410013 */ beq $v0, $at, .L80988FA0 -/* 000D4 80988F54 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 000D8 80988F58 10000018 */ beq $zero, $zero, .L80988FBC -/* 000DC 80988F5C 00000000 */ nop -.L80988F60: -/* 000E0 80988F60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000E4 80988F64 00300821 */ addu $at, $at, $s0 -/* 000E8 80988F68 AC201CC8 */ sw $zero, 0x1CC8($at) ## 00011CC8 -/* 000EC 80988F6C 3C018099 */ lui $at, %hi(D_8098CF80) ## $at = 80990000 -/* 000F0 80988F70 A439CF80 */ sh $t9, %lo(D_8098CF80)($at) -/* 000F4 80988F74 3C018099 */ lui $at, %hi(D_8098CF82) ## $at = 80990000 -/* 000F8 80988F78 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 -/* 000FC 80988F7C A428CF82 */ sh $t0, %lo(D_8098CF82)($at) -/* 00100 80988F80 100000B1 */ beq $zero, $zero, .L80989248 -/* 00104 80988F84 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80988F88: -/* 00108 80988F88 3C018099 */ lui $at, %hi(D_8098CF80) ## $at = 80990000 -/* 0010C 80988F8C A429CF80 */ sh $t1, %lo(D_8098CF80)($at) -/* 00110 80988F90 3C018099 */ lui $at, %hi(D_8098CF82) ## $at = 80990000 -/* 00114 80988F94 A42ACF82 */ sh $t2, %lo(D_8098CF82)($at) -/* 00118 80988F98 100000AB */ beq $zero, $zero, .L80989248 -/* 0011C 80988F9C 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80988FA0: -/* 00120 80988FA0 3C018099 */ lui $at, %hi(D_8098CF80) ## $at = 80990000 -/* 00124 80988FA4 A42BCF80 */ sh $t3, %lo(D_8098CF80)($at) -/* 00128 80988FA8 3C018099 */ lui $at, %hi(D_8098CF82) ## $at = 80990000 -/* 0012C 80988FAC 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 00130 80988FB0 A42CCF82 */ sh $t4, %lo(D_8098CF82)($at) -/* 00134 80988FB4 100000A4 */ beq $zero, $zero, .L80989248 -/* 00138 80988FB8 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80988FBC: -/* 0013C 80988FBC 0C00B55C */ jal Actor_Kill - -/* 00140 80988FC0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00144 80988FC4 100000A0 */ beq $zero, $zero, .L80989248 -/* 00148 80988FC8 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -glabel L80988FCC -/* 0014C 80988FCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00150 80988FD0 00300821 */ addu $at, $at, $s0 -/* 00154 80988FD4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00158 80988FD8 AC201CC8 */ sw $zero, 0x1CC8($at) ## 00011CC8 -/* 0015C 80988FDC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00160 80988FE0 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 00164 80988FE4 00000000 */ nop -/* 00168 80988FE8 460C0102 */ mul.s $f4, $f0, $f12 -/* 0016C 80988FEC 460C2080 */ add.s $f2, $f4, $f12 -/* 00170 80988FF0 E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 00174 80988FF4 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00178 80988FF8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0017C 80988FFC E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00180 80989000 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00184 80989004 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00188 80989008 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 0018C 8098900C 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 00190 80989010 00000000 */ nop -/* 00194 80989014 46060202 */ mul.s $f8, $f0, $f6 -/* 00198 80989018 46024280 */ add.s $f10, $f8, $f2 -/* 0019C 8098901C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001A0 80989020 E66A0150 */ swc1 $f10, 0x0150($s3) ## 00000150 -/* 001A4 80989024 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001A8 80989028 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 001AC 8098902C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 001B0 80989030 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 001B4 80989034 00000000 */ nop -/* 001B8 80989038 46100482 */ mul.s $f18, $f0, $f16 -/* 001BC 8098903C 46029100 */ add.s $f4, $f18, $f2 -/* 001C0 80989040 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001C4 80989044 E6640154 */ swc1 $f4, 0x0154($s3) ## 00000154 -/* 001C8 80989048 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001CC 8098904C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 001D0 80989050 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 001D4 80989054 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 001D8 80989058 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -/* 001DC 8098905C 46060202 */ mul.s $f8, $f0, $f6 -/* 001E0 80989060 46024280 */ add.s $f10, $f8, $f2 -/* 001E4 80989064 10000078 */ beq $zero, $zero, .L80989248 -/* 001E8 80989068 E66A0158 */ swc1 $f10, 0x0158($s3) ## 00000158 -glabel L8098906C -/* 001EC 8098906C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 001F0 80989070 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80989074: -/* 001F4 80989074 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001F8 80989078 00000000 */ nop -/* 001FC 8098907C 3C018099 */ lui $at, %hi(D_8098CA98) ## $at = 80990000 -/* 00200 80989080 C430CA98 */ lwc1 $f16, %lo(D_8098CA98)($at) -/* 00204 80989084 02120019 */ multu $s0, $s2 -/* 00208 80989088 46100482 */ mul.s $f18, $f0, $f16 -/* 0020C 8098908C 4600910D */ trunc.w.s $f4, $f18 -/* 00210 80989090 00006812 */ mflo $t5 -/* 00214 80989094 026D8821 */ addu $s1, $s3, $t5 -/* 00218 80989098 440F2000 */ mfc1 $t7, $f4 -/* 0021C 8098909C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00220 809890A0 A62F0170 */ sh $t7, 0x0170($s1) ## 00000170 -/* 00224 809890A4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00228 809890A8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 0022C 809890AC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00230 809890B0 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 00234 809890B4 46060202 */ mul.s $f8, $f0, $f6 -/* 00238 809890B8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0023C 809890BC 00108400 */ sll $s0, $s0, 16 -/* 00240 809890C0 00108403 */ sra $s0, $s0, 16 -/* 00244 809890C4 2A01001E */ slti $at, $s0, 0x001E -/* 00248 809890C8 460A4400 */ add.s $f16, $f8, $f10 -/* 0024C 809890CC 1420FFE9 */ bne $at, $zero, .L80989074 -/* 00250 809890D0 E6300168 */ swc1 $f16, 0x0168($s1) ## 00000168 -/* 00254 809890D4 1000005D */ beq $zero, $zero, .L8098924C -/* 00258 809890D8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -glabel L809890DC -/* 0025C 809890DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00260 809890E0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00264 809890E4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00268 809890E8 3C188016 */ lui $t8, %hi(gSaveContext+0xedc) -/* 0026C 809890EC E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 00270 809890F0 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00274 809890F4 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00278 809890F8 E6720168 */ swc1 $f18, 0x0168($s3) ## 00000168 -/* 0027C 809890FC 9718F53C */ lhu $t8, %lo(gSaveContext+0xedc)($t8) -/* 00280 80989100 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00284 80989104 00300821 */ addu $at, $at, $s0 -/* 00288 80989108 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 0028C 8098910C 17200012 */ bne $t9, $zero, .L80989158 -/* 00290 80989110 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00294 80989114 C6640024 */ lwc1 $f4, 0x0024($s3) ## 00000024 -/* 00298 80989118 26041C24 */ addiu $a0, $s0, 0x1C24 ## $a0 = 00001C24 -/* 0029C 8098911C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 002A0 80989120 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 002A4 80989124 C6660028 */ lwc1 $f6, 0x0028($s3) ## 00000028 -/* 002A8 80989128 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 002AC 8098912C 24070070 */ addiu $a3, $zero, 0x0070 ## $a3 = 00000070 -/* 002B0 80989130 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 002B4 80989134 C668002C */ lwc1 $f8, 0x002C($s3) ## 0000002C -/* 002B8 80989138 AFA00028 */ sw $zero, 0x0028($sp) -/* 002BC 8098913C AFA00024 */ sw $zero, 0x0024($sp) -/* 002C0 80989140 AFA00020 */ sw $zero, 0x0020($sp) -/* 002C4 80989144 AFA0001C */ sw $zero, 0x001C($sp) -/* 002C8 80989148 0C00C916 */ jal Actor_SpawnAsChild - -/* 002CC 8098914C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 002D0 80989150 1000003D */ beq $zero, $zero, .L80989248 -/* 002D4 80989154 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80989158: -/* 002D8 80989158 A4281D32 */ sh $t0, 0x1D32($at) ## 00001D32 -/* 002DC 8098915C 0C00B55C */ jal Actor_Kill - -/* 002E0 80989160 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 002E4 80989164 10000038 */ beq $zero, $zero, .L80989248 -/* 002E8 80989168 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -glabel L8098916C -/* 002EC 8098916C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002F0 80989170 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 002F4 80989174 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 002F8 80989178 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -/* 002FC 8098917C E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 00300 80989180 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00304 80989184 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00308 80989188 1000002F */ beq $zero, $zero, .L80989248 -/* 0030C 8098918C E66A0168 */ swc1 $f10, 0x0168($s3) ## 00000168 -glabel L80989190 -/* 00310 80989190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80989194 26051C24 */ addiu $a1, $s0, 0x1C24 ## $a1 = 00001C24 -/* 00318 80989198 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 -/* 0031C 8098919C 0C00CDD2 */ jal Actor_ChangeCategory - -/* 00320 809891A0 24070007 */ addiu $a3, $zero, 0x0007 ## $a3 = 00000007 -/* 00324 809891A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00328 809891A8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 0032C 809891AC 8E690004 */ lw $t1, 0x0004($s3) ## 00000004 -/* 00330 809891B0 866D001C */ lh $t5, 0x001C($s3) ## 0000001C -/* 00334 809891B4 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 00338 809891B8 01215025 */ or $t2, $t1, $at ## $t2 = 02000000 -/* 0033C 809891BC 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00340 809891C0 240C0023 */ addiu $t4, $zero, 0x0023 ## $t4 = 00000023 -/* 00344 809891C4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00348 809891C8 AE6A0004 */ sw $t2, 0x0004($s3) ## 00000004 -/* 0034C 809891CC A26B0003 */ sb $t3, 0x0003($s3) ## 00000003 -/* 00350 809891D0 A26C014E */ sb $t4, 0x014E($s3) ## 0000014E -/* 00354 809891D4 A260014D */ sb $zero, 0x014D($s3) ## 0000014D -/* 00358 809891D8 E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 0035C 809891DC E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00360 809891E0 15A1000C */ bne $t5, $at, .L80989214 -/* 00364 809891E4 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00368 809891E8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0036C 809891EC 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 00370 809891F0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00374 809891F4 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 00378 809891F8 3C058013 */ lui $a1, %hi(D_801333D4) -/* 0037C 809891FC 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00380 80989200 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00384 80989204 AFA70010 */ sw $a3, 0x0010($sp) -/* 00388 80989208 240428A6 */ addiu $a0, $zero, 0x28A6 ## $a0 = 000028A6 -/* 0038C 8098920C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00390 80989210 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80989214: -/* 00394 80989214 1000000C */ beq $zero, $zero, .L80989248 -/* 00398 80989218 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -glabel L8098921C -/* 0039C 8098921C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 003A0 80989220 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 003A4 80989224 240F0023 */ addiu $t7, $zero, 0x0023 ## $t7 = 00000023 -/* 003A8 80989228 A26F014E */ sb $t7, 0x014E($s3) ## 0000014E -/* 003AC 8098922C A260014D */ sb $zero, 0x014D($s3) ## 0000014D -/* 003B0 80989230 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -/* 003B4 80989234 E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 003B8 80989238 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 003BC 8098923C 10000002 */ beq $zero, $zero, .L80989248 -/* 003C0 80989240 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -glabel L80989244 -.L80989244: -/* 003C4 80989244 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80989248: -/* 003C8 80989248 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -.L8098924C: -/* 003CC 8098924C 02120019 */ multu $s0, $s2 -/* 003D0 80989250 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 003D4 80989254 00108400 */ sll $s0, $s0, 16 -/* 003D8 80989258 00108403 */ sra $s0, $s0, 16 -/* 003DC 8098925C 2A01001E */ slti $at, $s0, 0x001E -/* 003E0 80989260 0000C012 */ mflo $t8 -/* 003E4 80989264 0278C821 */ addu $t9, $s3, $t8 -/* 003E8 80989268 1420FFF8 */ bne $at, $zero, .L8098924C -/* 003EC 8098926C A3200172 */ sb $zero, 0x0172($t9) ## 00000172 -/* 003F0 80989270 3C058099 */ lui $a1, %hi(func_809892A4) ## $a1 = 80990000 -/* 003F4 80989274 24A592A4 */ addiu $a1, $a1, %lo(func_809892A4) ## $a1 = 809892A4 -/* 003F8 80989278 0C2623A0 */ jal func_80988E80 -/* 003FC 8098927C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00400 80989280 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00404 80989284 8FB00034 */ lw $s0, 0x0034($sp) -/* 00408 80989288 8FB10038 */ lw $s1, 0x0038($sp) -/* 0040C 8098928C 8FB2003C */ lw $s2, 0x003C($sp) -/* 00410 80989290 8FB30040 */ lw $s3, 0x0040($sp) -/* 00414 80989294 03E00008 */ jr $ra -/* 00418 80989298 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s deleted file mode 100644 index ac916d6235..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel DemoKankyo_Update -/* 00B08 80989988 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B0C 8098998C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B10 80989990 8C990600 */ lw $t9, 0x0600($a0) ## 00000600 -/* 00B14 80989994 0320F809 */ jalr $ra, $t9 -/* 00B18 80989998 00000000 */ nop -/* 00B1C 8098999C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B20 809899A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B24 809899A4 03E00008 */ jr $ra -/* 00B28 809899A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s deleted file mode 100644 index 68d7677fba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80988E80 -/* 00000 80988E80 03E00008 */ jr $ra -/* 00004 80988E84 AC850600 */ sw $a1, 0x0600($a0) ## 00000600 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s deleted file mode 100644 index 2e08f0ac6c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s +++ /dev/null @@ -1,324 +0,0 @@ -.late_rodata -glabel jtbl_8098CA9C -.word L809896CC -.word L809896CC -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L80989300 -.word L809896CC -.word L809896CC -.word L809896CC -.word L809896CC -.word L809896CC -.word L80989318 -.word L809896CC -.word L80989348 -.word L8098964C -.word L809896CC - -.text -glabel func_809892A4 -/* 00424 809892A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00428 809892A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0042C 809892AC 808F001E */ lb $t7, 0x001E($a0) ## 0000001E -/* 00430 809892B0 908E014C */ lbu $t6, 0x014C($a0) ## 0000014C -/* 00434 809892B4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00438 809892B8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0043C 809892BC 15CF0103 */ bne $t6, $t7, .L809896CC -/* 00440 809892C0 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 00444 809892C4 9498001C */ lhu $t8, 0x001C($a0) ## 0000001C -/* 00448 809892C8 2F010012 */ sltiu $at, $t8, 0x0012 -/* 0044C 809892CC 102000FF */ beq $at, $zero, .L809896CC -/* 00450 809892D0 0018C080 */ sll $t8, $t8, 2 -/* 00454 809892D4 3C018099 */ lui $at, %hi(jtbl_8098CA9C) ## $at = 80990000 -/* 00458 809892D8 00380821 */ addu $at, $at, $t8 -/* 0045C 809892DC 8C38CA9C */ lw $t8, %lo(jtbl_8098CA9C)($at) -/* 00460 809892E0 03000008 */ jr $t8 -/* 00464 809892E4 00000000 */ nop -glabel L809892E8 -/* 00468 809892E8 3C058099 */ lui $a1, %hi(func_80989800) ## $a1 = 80990000 -/* 0046C 809892EC 24A59800 */ addiu $a1, $a1, %lo(func_80989800) ## $a1 = 80989800 -/* 00470 809892F0 0C2623A0 */ jal func_80988E80 -/* 00474 809892F4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00478 809892F8 100000F5 */ beq $zero, $zero, .L809896D0 -/* 0047C 809892FC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80989300 -/* 00480 80989300 3C058099 */ lui $a1, %hi(func_8098987C) ## $a1 = 80990000 -/* 00484 80989304 24A5987C */ addiu $a1, $a1, %lo(func_8098987C) ## $a1 = 8098987C -/* 00488 80989308 0C2623A0 */ jal func_80988E80 -/* 0048C 8098930C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00490 80989310 100000EF */ beq $zero, $zero, .L809896D0 -/* 00494 80989314 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80989318 -/* 00498 80989318 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0049C 8098931C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 004A0 80989320 0C01B129 */ jal Flags_GetEnv -/* 004A4 80989324 AFA70018 */ sw $a3, 0x0018($sp) -/* 004A8 80989328 104000E8 */ beq $v0, $zero, .L809896CC -/* 004AC 8098932C 8FA70018 */ lw $a3, 0x0018($sp) -/* 004B0 80989330 3C058099 */ lui $a1, %hi(func_809898C8) ## $a1 = 80990000 -/* 004B4 80989334 24A598C8 */ addiu $a1, $a1, %lo(func_809898C8) ## $a1 = 809898C8 -/* 004B8 80989338 0C2623A0 */ jal func_80988E80 -/* 004BC 8098933C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004C0 80989340 100000E3 */ beq $zero, $zero, .L809896D0 -/* 004C4 80989344 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80989348 -/* 004C8 80989348 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004CC 8098934C 00C12021 */ addu $a0, $a2, $at -/* 004D0 80989350 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 004D4 80989354 A0850B06 */ sb $a1, 0x0B06($a0) ## 00000B06 -/* 004D8 80989358 A0850B07 */ sb $a1, 0x0B07($a0) ## 00000B07 -/* 004DC 8098935C A0850B08 */ sb $a1, 0x0B08($a0) ## 00000B08 -/* 004E0 80989360 00260821 */ addu $at, $at, $a2 -/* 004E4 80989364 A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 -/* 004E8 80989368 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -/* 004EC 8098936C 28410015 */ slti $at, $v0, 0x0015 -/* 004F0 80989370 1020003E */ beq $at, $zero, .L8098946C -/* 004F4 80989374 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 004F8 80989378 2861000F */ slti $at, $v1, 0x000F -/* 004FC 8098937C 5420003C */ bnel $at, $zero, .L80989470 -/* 00500 80989380 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00504 80989384 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00508 80989388 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0050C 8098938C 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 00510 80989390 04410005 */ bgez $v0, .L809893A8 -/* 00514 80989394 468021A0 */ cvt.s.w $f6, $f4 -/* 00518 80989398 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0051C 8098939C 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 00520 809893A0 00000000 */ nop -/* 00524 809893A4 46083180 */ add.s $f6, $f6, $f8 -.L809893A8: -/* 00528 809893A8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0052C 809893AC 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 00530 809893B0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00534 809893B4 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 00538 809893B8 460A3401 */ sub.s $f16, $f6, $f10 -/* 0053C 809893BC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00540 809893C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00544 809893C4 00260821 */ addu $at, $at, $a2 -/* 00548 809893C8 46128003 */ div.s $f0, $f16, $f18 -/* 0054C 809893CC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00550 809893D0 A0390B05 */ sb $t9, 0x0B05($at) ## 00010B05 -/* 00554 809893D4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00558 809893D8 46001102 */ mul.s $f4, $f2, $f0 -/* 0055C 809893DC 46041201 */ sub.s $f8, $f2, $f4 -/* 00560 809893E0 4449F800 */ cfc1 $t1, $31 -/* 00564 809893E4 44CAF800 */ ctc1 $t2, $31 -/* 00568 809893E8 00000000 */ nop -/* 0056C 809893EC 460041A4 */ cvt.w.s $f6, $f8 -/* 00570 809893F0 444AF800 */ cfc1 $t2, $31 -/* 00574 809893F4 00000000 */ nop -/* 00578 809893F8 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 0057C 809893FC 51400013 */ beql $t2, $zero, .L8098944C -/* 00580 80989400 440A3000 */ mfc1 $t2, $f6 -/* 00584 80989404 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 00588 80989408 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0058C 8098940C 46064181 */ sub.s $f6, $f8, $f6 -/* 00590 80989410 44CAF800 */ ctc1 $t2, $31 -/* 00594 80989414 00000000 */ nop -/* 00598 80989418 460031A4 */ cvt.w.s $f6, $f6 -/* 0059C 8098941C 444AF800 */ cfc1 $t2, $31 -/* 005A0 80989420 00000000 */ nop -/* 005A4 80989424 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 005A8 80989428 15400005 */ bne $t2, $zero, .L80989440 -/* 005AC 8098942C 00000000 */ nop -/* 005B0 80989430 440A3000 */ mfc1 $t2, $f6 -/* 005B4 80989434 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 005B8 80989438 10000007 */ beq $zero, $zero, .L80989458 -/* 005BC 8098943C 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80989440: -/* 005C0 80989440 10000005 */ beq $zero, $zero, .L80989458 -/* 005C4 80989444 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 005C8 80989448 440A3000 */ mfc1 $t2, $f6 -.L8098944C: -/* 005CC 8098944C 00000000 */ nop -/* 005D0 80989450 0540FFFB */ bltz $t2, .L80989440 -/* 005D4 80989454 00000000 */ nop -.L80989458: -/* 005D8 80989458 A08A0B09 */ sb $t2, 0x0B09($a0) ## 00000B09 -/* 005DC 8098945C 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -/* 005E0 80989460 44C9F800 */ ctc1 $t1, $31 -/* 005E4 80989464 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 005E8 80989468 00000000 */ nop -.L8098946C: -/* 005EC 8098946C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L80989470: -/* 005F0 80989470 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 005F4 80989474 2861000F */ slti $at, $v1, 0x000F -/* 005F8 80989478 1020003A */ beq $at, $zero, .L80989564 -/* 005FC 8098947C 28610004 */ slti $at, $v1, 0x0004 -/* 00600 80989480 54200039 */ bnel $at, $zero, .L80989568 -/* 00604 80989484 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00608 80989488 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 0060C 8098948C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00610 80989490 04410004 */ bgez $v0, .L809894A4 -/* 00614 80989494 46805420 */ cvt.s.w $f16, $f10 -/* 00618 80989498 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 0061C 8098949C 00000000 */ nop -/* 00620 809894A0 46128400 */ add.s $f16, $f16, $f18 -.L809894A4: -/* 00624 809894A4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00628 809894A8 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 0062C 809894AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00630 809894B0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00634 809894B4 46048201 */ sub.s $f8, $f16, $f4 -/* 00638 809894B8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0063C 809894BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00640 809894C0 00260821 */ addu $at, $at, $a2 -/* 00644 809894C4 46064003 */ div.s $f0, $f8, $f6 -/* 00648 809894C8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0064C 809894CC A02B0B05 */ sb $t3, 0x0B05($at) ## 00010B05 -/* 00650 809894D0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00654 809894D4 46001282 */ mul.s $f10, $f2, $f0 -/* 00658 809894D8 444CF800 */ cfc1 $t4, $31 -/* 0065C 809894DC 44CDF800 */ ctc1 $t5, $31 -/* 00660 809894E0 00000000 */ nop -/* 00664 809894E4 460054A4 */ cvt.w.s $f18, $f10 -/* 00668 809894E8 444DF800 */ cfc1 $t5, $31 -/* 0066C 809894EC 00000000 */ nop -/* 00670 809894F0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 00674 809894F4 51A00013 */ beql $t5, $zero, .L80989544 -/* 00678 809894F8 440D9000 */ mfc1 $t5, $f18 -/* 0067C 809894FC 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 00680 80989500 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00684 80989504 46125481 */ sub.s $f18, $f10, $f18 -/* 00688 80989508 44CDF800 */ ctc1 $t5, $31 -/* 0068C 8098950C 00000000 */ nop -/* 00690 80989510 460094A4 */ cvt.w.s $f18, $f18 -/* 00694 80989514 444DF800 */ cfc1 $t5, $31 -/* 00698 80989518 00000000 */ nop -/* 0069C 8098951C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 006A0 80989520 15A00005 */ bne $t5, $zero, .L80989538 -/* 006A4 80989524 00000000 */ nop -/* 006A8 80989528 440D9000 */ mfc1 $t5, $f18 -/* 006AC 8098952C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006B0 80989530 10000007 */ beq $zero, $zero, .L80989550 -/* 006B4 80989534 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80989538: -/* 006B8 80989538 10000005 */ beq $zero, $zero, .L80989550 -/* 006BC 8098953C 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 006C0 80989540 440D9000 */ mfc1 $t5, $f18 -.L80989544: -/* 006C4 80989544 00000000 */ nop -/* 006C8 80989548 05A0FFFB */ bltz $t5, .L80989538 -/* 006CC 8098954C 00000000 */ nop -.L80989550: -/* 006D0 80989550 A08D0B09 */ sb $t5, 0x0B09($a0) ## 00000B09 -/* 006D4 80989554 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -/* 006D8 80989558 44CCF800 */ ctc1 $t4, $31 -/* 006DC 8098955C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 006E0 80989560 00000000 */ nop -.L80989564: -/* 006E4 80989564 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -.L80989568: -/* 006E8 80989568 14610003 */ bne $v1, $at, .L80989578 -/* 006EC 8098956C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 006F0 80989570 AD000134 */ sw $zero, 0x0134($t0) ## 00000134 -/* 006F4 80989574 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -.L80989578: -/* 006F8 80989578 10400004 */ beq $v0, $zero, .L8098958C -/* 006FC 8098957C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00700 80989580 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00704 80989584 A0EE014E */ sb $t6, 0x014E($a3) ## 0000014E -/* 00708 80989588 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 000000FF -.L8098958C: -/* 0070C 8098958C 54410050 */ bnel $v0, $at, .L809896D0 -/* 00710 80989590 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00714 80989594 84CF00A4 */ lh $t7, 0x00A4($a2) ## 000000A4 -/* 00718 80989598 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 0071C 8098959C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00720 809895A0 15E10010 */ bne $t7, $at, .L809895E4 -/* 00724 809895A4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00728 809895A8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0072C 809895AC 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 00730 809895B0 3C018099 */ lui $at, %hi(D_8098CF84) ## $at = 80990000 -/* 00734 809895B4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00738 809895B8 A438CF84 */ sh $t8, %lo(D_8098CF84)($at) -/* 0073C 809895BC 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 -/* 00740 809895C0 3C0A8099 */ lui $t2, %hi(D_8098BBA0) ## $t2 = 80990000 -/* 00744 809895C4 3C098099 */ lui $t1, %hi(D_8098C080) ## $t1 = 80990000 -/* 00748 809895C8 13200004 */ beq $t9, $zero, .L809895DC -/* 0074C 809895CC 254ABBA0 */ addiu $t2, $t2, %lo(D_8098BBA0) ## $t2 = 8098BBA0 -/* 00750 809895D0 2529C080 */ addiu $t1, $t1, %lo(D_8098C080) ## $t1 = 8098C080 -/* 00754 809895D4 1000000F */ beq $zero, $zero, .L80989614 -/* 00758 809895D8 ACC91D68 */ sw $t1, 0x1D68($a2) ## 00001D68 -.L809895DC: -/* 0075C 809895DC 1000000D */ beq $zero, $zero, .L80989614 -/* 00760 809895E0 ACCA1D68 */ sw $t2, 0x1D68($a2) ## 00001D68 -.L809895E4: -/* 00764 809895E4 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00768 809895E8 3C018099 */ lui $at, %hi(D_8098CF84) ## $at = 80990000 -/* 0076C 809895EC A42BCF84 */ sh $t3, %lo(D_8098CF84)($at) -/* 00770 809895F0 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015E664 -/* 00774 809895F4 3C0E8099 */ lui $t6, %hi(D_8098B910) ## $t6 = 80990000 -/* 00778 809895F8 3C0D8099 */ lui $t5, %hi(D_8098BDD0) ## $t5 = 80990000 -/* 0077C 809895FC 11800004 */ beq $t4, $zero, .L80989610 -/* 00780 80989600 25CEB910 */ addiu $t6, $t6, %lo(D_8098B910) ## $t6 = 8098B910 -/* 00784 80989604 25ADBDD0 */ addiu $t5, $t5, %lo(D_8098BDD0) ## $t5 = 8098BDD0 -/* 00788 80989608 10000002 */ beq $zero, $zero, .L80989614 -/* 0078C 8098960C ACCD1D68 */ sw $t5, 0x1D68($a2) ## 00001D68 -.L80989610: -/* 00790 80989610 ACCE1D68 */ sw $t6, 0x1D68($a2) ## 00001D68 -.L80989614: -/* 00794 80989614 0C03032E */ jal func_800C0CB8 -/* 00798 80989618 AFA70018 */ sw $a3, 0x0018($sp) -/* 0079C 8098961C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 007A0 80989620 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 007A4 80989624 10400003 */ beq $v0, $zero, .L80989634 -/* 007A8 80989628 8FA70018 */ lw $a3, 0x0018($sp) -/* 007AC 8098962C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 007B0 80989630 A06F1414 */ sb $t7, 0x1414($v1) ## 8015FA74 -.L80989634: -/* 007B4 80989634 3C058099 */ lui $a1, %hi(func_809896DC) ## $a1 = 80990000 -/* 007B8 80989638 24A596DC */ addiu $a1, $a1, %lo(func_809896DC) ## $a1 = 809896DC -/* 007BC 8098963C 0C2623A0 */ jal func_80988E80 -/* 007C0 80989640 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007C4 80989644 10000022 */ beq $zero, $zero, .L809896D0 -/* 007C8 80989648 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8098964C -/* 007CC 8098964C 84D800A4 */ lh $t8, 0x00A4($a2) ## 000000A4 -/* 007D0 80989650 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 007D4 80989654 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 007D8 80989658 1701000D */ bne $t8, $at, .L80989690 -/* 007DC 8098965C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007E0 80989660 3C038016 */ lui $v1, %hi(gSaveContext) -/* 007E4 80989664 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 007E8 80989668 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 -/* 007EC 8098966C 3C0A8099 */ lui $t2, %hi(D_8098BCB0) ## $t2 = 80990000 -/* 007F0 80989670 3C098099 */ lui $t1, %hi(D_8098C1B0) ## $t1 = 80990000 -/* 007F4 80989674 13200004 */ beq $t9, $zero, .L80989688 -/* 007F8 80989678 254ABCB0 */ addiu $t2, $t2, %lo(D_8098BCB0) ## $t2 = 8098BCB0 -/* 007FC 8098967C 2529C1B0 */ addiu $t1, $t1, %lo(D_8098C1B0) ## $t1 = 8098C1B0 -/* 00800 80989680 1000000E */ beq $zero, $zero, .L809896BC -/* 00804 80989684 ACC91D68 */ sw $t1, 0x1D68($a2) ## 00001D68 -.L80989688: -/* 00808 80989688 1000000C */ beq $zero, $zero, .L809896BC -/* 0080C 8098968C ACCA1D68 */ sw $t2, 0x1D68($a2) ## 00001D68 -.L80989690: -/* 00810 80989690 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00814 80989694 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00818 80989698 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 -/* 0081C 8098969C 3C0D8099 */ lui $t5, %hi(D_8098BA20) ## $t5 = 80990000 -/* 00820 809896A0 3C0C8099 */ lui $t4, %hi(D_8098BF00) ## $t4 = 80990000 -/* 00824 809896A4 11600004 */ beq $t3, $zero, .L809896B8 -/* 00828 809896A8 25ADBA20 */ addiu $t5, $t5, %lo(D_8098BA20) ## $t5 = 8098BA20 -/* 0082C 809896AC 258CBF00 */ addiu $t4, $t4, %lo(D_8098BF00) ## $t4 = 8098BF00 -/* 00830 809896B0 10000002 */ beq $zero, $zero, .L809896BC -/* 00834 809896B4 ACCC1D68 */ sw $t4, 0x1D68($a2) ## 00001D68 -.L809896B8: -/* 00838 809896B8 ACCD1D68 */ sw $t5, 0x1D68($a2) ## 00001D68 -.L809896BC: -/* 0083C 809896BC 3C058099 */ lui $a1, %hi(func_809896E8) ## $a1 = 80990000 -/* 00840 809896C0 A06E1414 */ sb $t6, 0x1414($v1) ## 8015FA74 -/* 00844 809896C4 0C2623A0 */ jal func_80988E80 -/* 00848 809896C8 24A596E8 */ addiu $a1, $a1, %lo(func_809896E8) ## $a1 = 809896E8 -glabel L809896CC -.L809896CC: -/* 0084C 809896CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809896D0: -/* 00850 809896D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00854 809896D4 03E00008 */ jr $ra -/* 00858 809896D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s deleted file mode 100644 index 63c6aa76a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_809896DC -/* 0085C 809896DC AFA40000 */ sw $a0, 0x0000($sp) -/* 00860 809896E0 03E00008 */ jr $ra -/* 00864 809896E4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s deleted file mode 100644 index d7a4d3e869..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_809896E8 -/* 00868 809896E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0086C 809896EC AFA5001C */ sw $a1, 0x001C($sp) -/* 00870 809896F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00874 809896F4 3C058099 */ lui $a1, %hi(func_809896DC) ## $a1 = 80990000 -/* 00878 809896F8 0C2623A0 */ jal func_80988E80 -/* 0087C 809896FC 24A596DC */ addiu $a1, $a1, %lo(func_809896DC) ## $a1 = 809896DC -/* 00880 80989700 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00884 80989704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00888 80989708 03E00008 */ jr $ra -/* 0088C 8098970C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s deleted file mode 100644 index c4ae5c043c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80989710 -/* 00890 80989710 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00894 80989714 00067880 */ sll $t7, $a2, 2 -/* 00898 80989718 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0089C 8098971C AFA40030 */ sw $a0, 0x0030($sp) -/* 008A0 80989720 AFA60038 */ sw $a2, 0x0038($sp) -/* 008A4 80989724 00AFC021 */ addu $t8, $a1, $t7 -/* 008A8 80989728 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 008AC 8098972C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 008B0 80989730 8C4A0018 */ lw $t2, 0x0018($v0) ## 00000018 -/* 008B4 80989734 8C59000C */ lw $t9, 0x000C($v0) ## 0000000C -/* 008B8 80989738 8C480010 */ lw $t0, 0x0010($v0) ## 00000010 -/* 008BC 8098973C 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 008C0 80989740 8C490014 */ lw $t1, 0x0014($v0) ## 00000014 -/* 008C4 80989744 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 008C8 80989748 46805420 */ cvt.s.w $f16, $f10 -/* 008CC 8098974C 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 008D0 80989750 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 008D4 80989754 468020A0 */ cvt.s.w $f2, $f4 -/* 008D8 80989758 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 008DC 8098975C 8C4B001C */ lw $t3, 0x001C($v0) ## 0000001C -/* 008E0 80989760 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 008E4 80989764 46803320 */ cvt.s.w $f12, $f6 -/* 008E8 80989768 46809120 */ cvt.s.w $f4, $f18 -/* 008EC 8098976C 468043A0 */ cvt.s.w $f14, $f8 -/* 008F0 80989770 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 008F4 80989774 8C4C0020 */ lw $t4, 0x0020($v0) ## 00000020 -/* 008F8 80989778 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 008FC 8098977C 00000000 */ nop -/* 00900 80989780 46803220 */ cvt.s.w $f8, $f6 -/* 00904 80989784 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 00908 80989788 94E61D74 */ lhu $a2, 0x1D74($a3) ## 00001D74 -/* 0090C 8098978C 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 00910 80989790 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 00914 80989794 E7AE002C */ swc1 $f14, 0x002C($sp) -/* 00918 80989798 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 0091C 8098979C 0C01BE4F */ jal func_8006F93C -/* 00920 809897A0 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 00924 809897A4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 00928 809897A8 C7AA0018 */ lwc1 $f10, 0x0018($sp) -/* 0092C 809897AC 8FA20030 */ lw $v0, 0x0030($sp) -/* 00930 809897B0 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 00934 809897B4 46025401 */ sub.s $f16, $f10, $f2 -/* 00938 809897B8 C7AE002C */ lwc1 $f14, 0x002C($sp) -/* 0093C 809897BC 46008482 */ mul.s $f18, $f16, $f0 -/* 00940 809897C0 46029100 */ add.s $f4, $f18, $f2 -/* 00944 809897C4 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 00948 809897C8 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 0094C 809897CC 460C3201 */ sub.s $f8, $f6, $f12 -/* 00950 809897D0 46004282 */ mul.s $f10, $f8, $f0 -/* 00954 809897D4 460C5400 */ add.s $f16, $f10, $f12 -/* 00958 809897D8 E4500028 */ swc1 $f16, 0x0028($v0) ## 00000028 -/* 0095C 809897DC C7B20020 */ lwc1 $f18, 0x0020($sp) -/* 00960 809897E0 460E9101 */ sub.s $f4, $f18, $f14 -/* 00964 809897E4 46002182 */ mul.s $f6, $f4, $f0 -/* 00968 809897E8 460E3200 */ add.s $f8, $f6, $f14 -/* 0096C 809897EC E448002C */ swc1 $f8, 0x002C($v0) ## 0000002C -/* 00970 809897F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00974 809897F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00978 809897F8 03E00008 */ jr $ra -/* 0097C 809897FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s deleted file mode 100644 index f4b1c75e86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80989800 -/* 00980 80989800 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00984 80989804 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00988 80989808 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0098C 8098980C 51C0000C */ beql $t6, $zero, .L80989840 -/* 00990 80989810 C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -/* 00994 80989814 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00998 80989818 00027880 */ sll $t7, $v0, 2 -/* 0099C 8098981C 00AFC021 */ addu $t8, $a1, $t7 -/* 009A0 80989820 8F191D84 */ lw $t9, 0x1D84($t8) ## 00001D84 -/* 009A4 80989824 2446FFFE */ addiu $a2, $v0, 0xFFFE ## $a2 = FFFFFFFE -/* 009A8 80989828 53200005 */ beql $t9, $zero, .L80989840 -/* 009AC 8098982C C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -/* 009B0 80989830 0C2625C4 */ jal func_80989710 -/* 009B4 80989834 AFA40018 */ sw $a0, 0x0018($sp) -/* 009B8 80989838 8FA40018 */ lw $a0, 0x0018($sp) -/* 009BC 8098983C C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -.L80989840: -/* 009C0 80989840 C4860150 */ lwc1 $f6, 0x0150($a0) ## 00000150 -/* 009C4 80989844 C48A0160 */ lwc1 $f10, 0x0160($a0) ## 00000160 -/* 009C8 80989848 C4900154 */ lwc1 $f16, 0x0154($a0) ## 00000154 -/* 009CC 8098984C 46062200 */ add.s $f8, $f4, $f6 -/* 009D0 80989850 C4860158 */ lwc1 $f6, 0x0158($a0) ## 00000158 -/* 009D4 80989854 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 009D8 80989858 46105480 */ add.s $f18, $f10, $f16 -/* 009DC 8098985C E488015C */ swc1 $f8, 0x015C($a0) ## 0000015C -/* 009E0 80989860 46062200 */ add.s $f8, $f4, $f6 -/* 009E4 80989864 E4920160 */ swc1 $f18, 0x0160($a0) ## 00000160 -/* 009E8 80989868 E4880164 */ swc1 $f8, 0x0164($a0) ## 00000164 -/* 009EC 8098986C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009F0 80989870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009F4 80989874 03E00008 */ jr $ra -/* 009F8 80989878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s deleted file mode 100644 index 656684e6f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8098987C -/* 009FC 8098987C AFA50004 */ sw $a1, 0x0004($sp) -/* 00A00 80989880 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 00A04 80989884 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80989888: -/* 00A08 80989888 00450019 */ multu $v0, $a1 -/* 00A0C 8098988C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00A10 80989890 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000001 -/* 00A14 80989894 2841001E */ slti $at, $v0, 0x001E -/* 00A18 80989898 00007012 */ mflo $t6 -/* 00A1C 8098989C 008E1821 */ addu $v1, $a0, $t6 -/* 00A20 809898A0 C4640168 */ lwc1 $f4, 0x0168($v1) ## 00000168 -/* 00A24 809898A4 846F0170 */ lh $t7, 0x0170($v1) ## 00000170 -/* 00A28 809898A8 4600218D */ trunc.w.s $f6, $f4 -/* 00A2C 809898AC 44093000 */ mfc1 $t1, $f6 -/* 00A30 809898B0 00000000 */ nop -/* 00A34 809898B4 01E95021 */ addu $t2, $t7, $t1 -/* 00A38 809898B8 1420FFF3 */ bne $at, $zero, .L80989888 -/* 00A3C 809898BC A46A0170 */ sh $t2, 0x0170($v1) ## 00000170 -/* 00A40 809898C0 03E00008 */ jr $ra -/* 00A44 809898C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s deleted file mode 100644 index 656dfcc5fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_809898C8 -/* 00A48 809898C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A4C 809898CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00A50 809898D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A54 809898D4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A58 809898D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A5C 809898DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A60 809898E0 2405201E */ addiu $a1, $zero, 0x201E ## $a1 = 0000201E -/* 00A64 809898E4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A68 809898E8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00A6C 809898EC C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 00A70 809898F0 3C0142CC */ lui $at, 0x42CC ## $at = 42CC0000 -/* 00A74 809898F4 44818000 */ mtc1 $at, $f16 ## $f16 = 102.00 -/* 00A78 809898F8 46062200 */ add.s $f8, $f4, $f6 -/* 00A7C 809898FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A80 80989900 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -/* 00A84 80989904 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 00A88 80989908 460A803E */ c.le.s $f16, $f10 -/* 00A8C 8098990C 00000000 */ nop -/* 00A90 80989910 4502000F */ bc1fl .L80989950 -/* 00A94 80989914 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A98 80989918 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A9C 8098991C 24052893 */ addiu $a1, $zero, 0x2893 ## $a1 = 00002893 -/* 00AA0 80989920 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00AA4 80989924 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00AA8 80989928 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C -/* 00AAC 8098992C 35CF0800 */ ori $t7, $t6, 0x0800 ## $t7 = 00000800 -/* 00AB0 80989930 A44F0EDC */ sh $t7, 0x0EDC($v0) ## 8015F53C -/* 00AB4 80989934 0C00B55C */ jal Actor_Kill - -/* 00AB8 80989938 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C -/* 00ABC 8098993C 3C058099 */ lui $a1, %hi(func_80989960) ## $a1 = 80990000 -/* 00AC0 80989940 24A59960 */ addiu $a1, $a1, %lo(func_80989960) ## $a1 = 80989960 -/* 00AC4 80989944 0C2623A0 */ jal func_80988E80 -/* 00AC8 80989948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ACC 8098994C 8FBF001C */ lw $ra, 0x001C($sp) -.L80989950: -/* 00AD0 80989950 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AD4 80989954 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AD8 80989958 03E00008 */ jr $ra -/* 00ADC 8098995C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s deleted file mode 100644 index dc48c40de6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80989960 -/* 00AE0 80989960 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AE4 80989964 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AE8 80989968 AFA40018 */ sw $a0, 0x0018($sp) -/* 00AEC 8098996C AFA5001C */ sw $a1, 0x001C($sp) -/* 00AF0 80989970 0C00B55C */ jal Actor_Kill - -/* 00AF4 80989974 8C84011C */ lw $a0, 0x011C($a0) ## 0000011C -/* 00AF8 80989978 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AFC 8098997C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B00 80989980 03E00008 */ jr $ra -/* 00B04 80989984 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s deleted file mode 100644 index 21b72868ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel func_80989B54 -/* 00CD4 80989B54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CD8 80989B58 AFBF001C */ sw $ra, 0x001C($sp) -/* 00CDC 80989B5C AFB10018 */ sw $s1, 0x0018($sp) -/* 00CE0 80989B60 AFB00014 */ sw $s0, 0x0014($sp) -/* 00CE4 80989B64 AFA60028 */ sw $a2, 0x0028($sp) -/* 00CE8 80989B68 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 00CEC 80989B6C 00063400 */ sll $a2, $a2, 16 -/* 00CF0 80989B70 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 00CF4 80989B74 00063403 */ sra $a2, $a2, 16 -/* 00CF8 80989B78 10410022 */ beq $v0, $at, .L80989C04 -/* 00CFC 80989B7C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00D00 80989B80 24010047 */ addiu $at, $zero, 0x0047 ## $at = 00000047 -/* 00D04 80989B84 10410007 */ beq $v0, $at, .L80989BA4 -/* 00D08 80989B88 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 00D0C 80989B8C 10410039 */ beq $v0, $at, .L80989C74 -/* 00D10 80989B90 00067080 */ sll $t6, $a2, 2 -/* 00D14 80989B94 01C67021 */ addu $t6, $t6, $a2 -/* 00D18 80989B98 000E70C0 */ sll $t6, $t6, 3 -/* 00D1C 80989B9C 1000004E */ beq $zero, $zero, .L80989CD8 -/* 00D20 80989BA0 008E8021 */ addu $s0, $a0, $t6 -.L80989BA4: -/* 00D24 80989BA4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00D28 80989BA8 A7A6002A */ sh $a2, 0x002A($sp) -/* 00D2C 80989BAC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 00D30 80989BB0 44811000 */ mtc1 $at, $f2 ## $f2 = 500.00 -/* 00D34 80989BB4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00D38 80989BB8 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00D3C 80989BBC 87A6002A */ lh $a2, 0x002A($sp) -/* 00D40 80989BC0 46040181 */ sub.s $f6, $f0, $f4 -/* 00D44 80989BC4 00067880 */ sll $t7, $a2, 2 -/* 00D48 80989BC8 01E67821 */ addu $t7, $t7, $a2 -/* 00D4C 80989BCC 000F78C0 */ sll $t7, $t7, 3 -/* 00D50 80989BD0 46023202 */ mul.s $f8, $f6, $f2 -/* 00D54 80989BD4 022F8021 */ addu $s0, $s1, $t7 -/* 00D58 80989BD8 E6020154 */ swc1 $f2, 0x0154($s0) ## 00000154 -/* 00D5C 80989BDC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00D60 80989BE0 E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 -/* 00D64 80989BE4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00D68 80989BE8 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 00D6C 80989BEC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 00D70 80989BF0 44819000 */ mtc1 $at, $f18 ## $f18 = 500.00 -/* 00D74 80989BF4 460A0401 */ sub.s $f16, $f0, $f10 -/* 00D78 80989BF8 46128102 */ mul.s $f4, $f16, $f18 -/* 00D7C 80989BFC 10000036 */ beq $zero, $zero, .L80989CD8 -/* 00D80 80989C00 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L80989C04: -/* 00D84 80989C04 0006C080 */ sll $t8, $a2, 2 -/* 00D88 80989C08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D8C 80989C0C 0306C021 */ addu $t8, $t8, $a2 -/* 00D90 80989C10 0018C0C0 */ sll $t8, $t8, 3 -/* 00D94 80989C14 02388021 */ addu $s0, $s1, $t8 -/* 00D98 80989C18 E600015C */ swc1 $f0, 0x015C($s0) ## 0000015C -/* 00D9C 80989C1C E6000160 */ swc1 $f0, 0x0160($s0) ## 00000160 -/* 00DA0 80989C20 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DA4 80989C24 E6000164 */ swc1 $f0, 0x0164($s0) ## 00000164 -/* 00DA8 80989C28 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00DAC 80989C2C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00DB0 80989C30 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 00DB4 80989C34 44815000 */ mtc1 $at, $f10 ## $f10 = 180.00 -/* 00DB8 80989C38 46060201 */ sub.s $f8, $f0, $f6 -/* 00DBC 80989C3C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00DC0 80989C40 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00DC4 80989C44 460A4402 */ mul.s $f16, $f8, $f10 -/* 00DC8 80989C48 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 -/* 00DCC 80989C4C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DD0 80989C50 E6100150 */ swc1 $f16, 0x0150($s0) ## 00000150 -/* 00DD4 80989C54 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00DD8 80989C58 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00DDC 80989C5C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 00DE0 80989C60 44814000 */ mtc1 $at, $f8 ## $f8 = 180.00 -/* 00DE4 80989C64 46040181 */ sub.s $f6, $f0, $f4 -/* 00DE8 80989C68 46083282 */ mul.s $f10, $f6, $f8 -/* 00DEC 80989C6C 1000001A */ beq $zero, $zero, .L80989CD8 -/* 00DF0 80989C70 E60A0158 */ swc1 $f10, 0x0158($s0) ## 00000158 -.L80989C74: -/* 00DF4 80989C74 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DF8 80989C78 A7A6002A */ sh $a2, 0x002A($sp) -/* 00DFC 80989C7C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00E00 80989C80 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00E04 80989C84 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00E08 80989C88 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 -/* 00E0C 80989C8C 46100481 */ sub.s $f18, $f0, $f16 -/* 00E10 80989C90 87A6002A */ lh $a2, 0x002A($sp) -/* 00E14 80989C94 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 -/* 00E18 80989C98 44814000 */ mtc1 $at, $f8 ## $f8 = -500.00 -/* 00E1C 80989C9C 46049182 */ mul.s $f6, $f18, $f4 -/* 00E20 80989CA0 0006C880 */ sll $t9, $a2, 2 -/* 00E24 80989CA4 0326C821 */ addu $t9, $t9, $a2 -/* 00E28 80989CA8 0019C8C0 */ sll $t9, $t9, 3 -/* 00E2C 80989CAC 02398021 */ addu $s0, $s1, $t9 -/* 00E30 80989CB0 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -/* 00E34 80989CB4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00E38 80989CB8 E6060150 */ swc1 $f6, 0x0150($s0) ## 00000150 -/* 00E3C 80989CBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00E40 80989CC0 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 00E44 80989CC4 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00E48 80989CC8 44819000 */ mtc1 $at, $f18 ## $f18 = 600.00 -/* 00E4C 80989CCC 460A0401 */ sub.s $f16, $f0, $f10 -/* 00E50 80989CD0 46128102 */ mul.s $f4, $f16, $f18 -/* 00E54 80989CD4 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L80989CD8: -/* 00E58 80989CD8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00E5C 80989CDC 00000000 */ nop -/* 00E60 80989CE0 3C088099 */ lui $t0, %hi(D_8098CF80) ## $t0 = 80990000 -/* 00E64 80989CE4 8508CF80 */ lh $t0, %lo(D_8098CF80)($t0) -/* 00E68 80989CE8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00E6C 80989CEC 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00E70 80989CF0 44883000 */ mtc1 $t0, $f6 ## $f6 = -0.00 -/* 00E74 80989CF4 00000000 */ nop -/* 00E78 80989CF8 468030A0 */ cvt.s.w $f2, $f6 -/* 00E7C 80989CFC 46081282 */ mul.s $f10, $f2, $f8 -/* 00E80 80989D00 00000000 */ nop -/* 00E84 80989D04 460A0402 */ mul.s $f16, $f0, $f10 -/* 00E88 80989D08 46028480 */ add.s $f18, $f16, $f2 -/* 00E8C 80989D0C E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 00E90 80989D10 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E94 80989D14 8FB10018 */ lw $s1, 0x0018($sp) -/* 00E98 80989D18 8FB00014 */ lw $s0, 0x0014($sp) -/* 00E9C 80989D1C 03E00008 */ jr $ra -/* 00EA0 80989D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s deleted file mode 100644 index d26d92eaee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ /dev/null @@ -1,453 +0,0 @@ -.rdata -glabel D_8098C898 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8AC - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8C0 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB2C - .float 1500.0 - -glabel D_8098CB30 - .float 3.14159274101 - -glabel D_8098CB34 - .float 0.001 - -.text -glabel func_80989D24 -/* 00EA4 80989D24 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 -/* 00EA8 80989D28 AFB5005C */ sw $s5, 0x005C($sp) -/* 00EAC 80989D2C 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 00EB0 80989D30 AFBF006C */ sw $ra, 0x006C($sp) -/* 00EB4 80989D34 AFBE0068 */ sw $s8, 0x0068($sp) -/* 00EB8 80989D38 AFB70064 */ sw $s7, 0x0064($sp) -/* 00EBC 80989D3C AFB60060 */ sw $s6, 0x0060($sp) -/* 00EC0 80989D40 AFB40058 */ sw $s4, 0x0058($sp) -/* 00EC4 80989D44 AFB30054 */ sw $s3, 0x0054($sp) -/* 00EC8 80989D48 AFB20050 */ sw $s2, 0x0050($sp) -/* 00ECC 80989D4C AFB1004C */ sw $s1, 0x004C($sp) -/* 00ED0 80989D50 AFB00048 */ sw $s0, 0x0048($sp) -/* 00ED4 80989D54 F7BE0040 */ sdc1 $f30, 0x0040($sp) -/* 00ED8 80989D58 F7BC0038 */ sdc1 $f28, 0x0038($sp) -/* 00EDC 80989D5C F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 00EE0 80989D60 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 00EE4 80989D64 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00EE8 80989D68 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00EEC 80989D6C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00EF0 80989D70 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 00EF4 80989D74 3C068099 */ lui $a2, %hi(D_8098C898) ## $a2 = 80990000 -/* 00EF8 80989D78 24C6C898 */ addiu $a2, $a2, %lo(D_8098C898) ## $a2 = 8098C898 -/* 00EFC 80989D7C 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 -/* 00F00 80989D80 240704A2 */ addiu $a3, $zero, 0x04A2 ## $a3 = 000004A2 -/* 00F04 80989D84 0C031AB1 */ jal Graph_OpenDisps -/* 00F08 80989D88 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00F0C 80989D8C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00F10 80989D90 4481F000 */ mtc1 $at, $f30 ## $f30 = 300.00 -/* 00F14 80989D94 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 00F18 80989D98 4481E000 */ mtc1 $at, $f28 ## $f28 = 350.00 -/* 00F1C 80989D9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F20 80989DA0 4481D000 */ mtc1 $at, $f26 ## $f26 = 10.00 -/* 00F24 80989DA4 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 00F28 80989DA8 4481C000 */ mtc1 $at, $f24 ## $f24 = 4000.00 -/* 00F2C 80989DAC 3C0E0600 */ lui $t6, %hi(D_06000080) ## $t6 = 06000000 -/* 00F30 80989DB0 25CE0080 */ addiu $t6, $t6, %lo(D_06000080) ## $t6 = 06000080 -/* 00F34 80989DB4 3C018099 */ lui $at, %hi(D_8098CB2C) ## $at = 80990000 -/* 00F38 80989DB8 3C1E8099 */ lui $s8, %hi(D_8098C8AC) ## $s8 = 80990000 -/* 00F3C 80989DBC 3C17DA38 */ lui $s7, 0xDA38 ## $s7 = DA380000 -/* 00F40 80989DC0 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00F44 80989DC4 36F70003 */ ori $s7, $s7, 0x0003 ## $s7 = DA380003 -/* 00F48 80989DC8 27DEC8AC */ addiu $s8, $s8, %lo(D_8098C8AC) ## $s8 = 8098C8AC -/* 00F4C 80989DCC C436CB2C */ lwc1 $f22, %lo(D_8098CB2C)($at) -/* 00F50 80989DD0 AFAE0074 */ sw $t6, 0x0074($sp) -/* 00F54 80989DD4 A7A000DE */ sh $zero, 0x00DE($sp) -/* 00F58 80989DD8 24160043 */ addiu $s6, $zero, 0x0043 ## $s6 = 00000043 -.L80989DDC: -/* 00F5C 80989DDC C6B000E0 */ lwc1 $f16, 0x00E0($s5) ## 000000E0 -/* 00F60 80989DE0 C6A400EC */ lwc1 $f4, 0x00EC($s5) ## 000000EC -/* 00F64 80989DE4 C6A600F0 */ lwc1 $f6, 0x00F0($s5) ## 000000F0 -/* 00F68 80989DE8 C6A800E4 */ lwc1 $f8, 0x00E4($s5) ## 000000E4 -/* 00F6C 80989DEC 46102301 */ sub.s $f12, $f4, $f16 -/* 00F70 80989DF0 C6AA00F4 */ lwc1 $f10, 0x00F4($s5) ## 000000F4 -/* 00F74 80989DF4 C6B200E8 */ lwc1 $f18, 0x00E8($s5) ## 000000E8 -/* 00F78 80989DF8 46083081 */ sub.s $f2, $f6, $f8 -/* 00F7C 80989DFC 460C6102 */ mul.s $f4, $f12, $f12 -/* 00F80 80989E00 86AF00A4 */ lh $t7, 0x00A4($s5) ## 000000A4 -/* 00F84 80989E04 46125381 */ sub.s $f14, $f10, $f18 -/* 00F88 80989E08 46021182 */ mul.s $f6, $f2, $f2 -/* 00F8C 80989E0C 87B800DE */ lh $t8, 0x00DE($sp) -/* 00F90 80989E10 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00F94 80989E14 460E7282 */ mul.s $f10, $f14, $f14 -/* 00F98 80989E18 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 -/* 00F9C 80989E1C 46062200 */ add.s $f8, $f4, $f6 -/* 00FA0 80989E20 460A4000 */ add.s $f0, $f8, $f10 -/* 00FA4 80989E24 12CF0015 */ beq $s6, $t7, .L80989E7C -/* 00FA8 80989E28 46000004 */ sqrt.s $f0, $f0 -/* 00FAC 80989E2C 46006483 */ div.s $f18, $f12, $f0 -/* 00FB0 80989E30 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00FB4 80989E34 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 00FB8 80989E38 0018C880 */ sll $t9, $t8, 2 -/* 00FBC 80989E3C 0338C821 */ addu $t9, $t9, $t8 -/* 00FC0 80989E40 0019C8C0 */ sll $t9, $t9, 3 -/* 00FC4 80989E44 02999821 */ addu $s3, $s4, $t9 -/* 00FC8 80989E48 46001203 */ div.s $f8, $f2, $f0 -/* 00FCC 80989E4C 461C9102 */ mul.s $f4, $f18, $f28 -/* 00FD0 80989E50 46048180 */ add.s $f6, $f16, $f4 -/* 00FD4 80989E54 460A4482 */ mul.s $f18, $f8, $f10 -/* 00FD8 80989E58 E666015C */ swc1 $f6, 0x015C($s3) ## 0000015C -/* 00FDC 80989E5C C6A400E4 */ lwc1 $f4, 0x00E4($s5) ## 000000E4 -/* 00FE0 80989E60 46007283 */ div.s $f10, $f14, $f0 -/* 00FE4 80989E64 46122180 */ add.s $f6, $f4, $f18 -/* 00FE8 80989E68 E6660160 */ swc1 $f6, 0x0160($s3) ## 00000160 -/* 00FEC 80989E6C C6A800E8 */ lwc1 $f8, 0x00E8($s5) ## 000000E8 -/* 00FF0 80989E70 461C5102 */ mul.s $f4, $f10, $f28 -/* 00FF4 80989E74 46044480 */ add.s $f18, $f8, $f4 -/* 00FF8 80989E78 E6720164 */ swc1 $f18, 0x0164($s3) ## 00000164 -.L80989E7C: -/* 00FFC 80989E7C 87A800DE */ lh $t0, 0x00DE($sp) -/* 01000 80989E80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01004 80989E84 00084880 */ sll $t1, $t0, 2 -/* 01008 80989E88 01284821 */ addu $t1, $t1, $t0 -/* 0100C 80989E8C 000948C0 */ sll $t1, $t1, 3 -/* 01010 80989E90 02899821 */ addu $s3, $s4, $t1 -/* 01014 80989E94 92620172 */ lbu $v0, 0x0172($s3) ## 00000172 -/* 01018 80989E98 10400009 */ beq $v0, $zero, .L80989EC0 -/* 0101C 80989E9C 00000000 */ nop -/* 01020 80989EA0 10410024 */ beq $v0, $at, .L80989F34 -/* 01024 80989EA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01028 80989EA8 1041006B */ beq $v0, $at, .L8098A058 -/* 0102C 80989EAC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01030 80989EB0 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 01034 80989EB4 C66A0160 */ lwc1 $f10, 0x0160($s3) ## 00000160 -/* 01038 80989EB8 10000070 */ beq $zero, $zero, .L8098A07C -/* 0103C 80989EBC 460A3380 */ add.s $f14, $f6, $f10 -.L80989EC0: -/* 01040 80989EC0 0C2626D5 */ jal func_80989B54 -/* 01044 80989EC4 87A600DE */ lh $a2, 0x00DE($sp) -/* 01048 80989EC8 3C0A8016 */ lui $t2, %hi(gSaveContext) -/* 0104C 80989ECC 8D4AE660 */ lw $t2, %lo(gSaveContext)($t2) -/* 01050 80989ED0 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 01054 80989ED4 15410009 */ bne $t2, $at, .L80989EFC -/* 01058 80989ED8 00000000 */ nop -/* 0105C 80989EDC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01060 80989EE0 00000000 */ nop -/* 01064 80989EE4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 01068 80989EE8 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 -/* 0106C 80989EEC 00000000 */ nop -/* 01070 80989EF0 46080102 */ mul.s $f4, $f0, $f8 -/* 01074 80989EF4 10000008 */ beq $zero, $zero, .L80989F18 -/* 01078 80989EF8 E6640154 */ swc1 $f4, 0x0154($s3) ## 00000154 -.L80989EFC: -/* 0107C 80989EFC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01080 80989F00 00000000 */ nop -/* 01084 80989F04 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 -/* 01088 80989F08 44819000 */ mtc1 $at, $f18 ## $f18 = -500.00 -/* 0108C 80989F0C 00000000 */ nop -/* 01090 80989F10 46120182 */ mul.s $f6, $f0, $f18 -/* 01094 80989F14 E6660154 */ swc1 $f6, 0x0154($s3) ## 00000154 -.L80989F18: -/* 01098 80989F18 926B0172 */ lbu $t3, 0x0172($s3) ## 00000172 -/* 0109C 80989F1C C66A0154 */ lwc1 $f10, 0x0154($s3) ## 00000154 -/* 010A0 80989F20 C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 010A4 80989F24 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 010A8 80989F28 A26C0172 */ sb $t4, 0x0172($s3) ## 00000172 -/* 010AC 80989F2C 10000053 */ beq $zero, $zero, .L8098A07C -/* 010B0 80989F30 46085380 */ add.s $f14, $f10, $f8 -.L80989F34: -/* 010B4 80989F34 46001103 */ div.s $f4, $f2, $f0 -/* 010B8 80989F38 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 010BC 80989F3C 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 010C0 80989F40 3C0D8016 */ lui $t5, %hi(gSaveContext) -/* 010C4 80989F44 8DADE660 */ lw $t5, %lo(gSaveContext)($t5) -/* 010C8 80989F48 C6AA00E4 */ lwc1 $f10, 0x00E4($s5) ## 000000E4 -/* 010CC 80989F4C 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 010D0 80989F50 3C028016 */ lui $v0, %hi(gSaveContext) -/* 010D4 80989F54 46122182 */ mul.s $f6, $f4, $f18 -/* 010D8 80989F58 15A10006 */ bne $t5, $at, .L80989F74 -/* 010DC 80989F5C 46065300 */ add.s $f12, $f10, $f6 -/* 010E0 80989F60 C6680154 */ lwc1 $f8, 0x0154($s3) ## 00000154 -/* 010E4 80989F64 C6640168 */ lwc1 $f4, 0x0168($s3) ## 00000168 -/* 010E8 80989F68 46044481 */ sub.s $f18, $f8, $f4 -/* 010EC 80989F6C 10000005 */ beq $zero, $zero, .L80989F84 -/* 010F0 80989F70 E6720154 */ swc1 $f18, 0x0154($s3) ## 00000154 -.L80989F74: -/* 010F4 80989F74 C66A0154 */ lwc1 $f10, 0x0154($s3) ## 00000154 -/* 010F8 80989F78 C6660168 */ lwc1 $f6, 0x0168($s3) ## 00000168 -/* 010FC 80989F7C 46065200 */ add.s $f8, $f10, $f6 -/* 01100 80989F80 E6680154 */ swc1 $f8, 0x0154($s3) ## 00000154 -.L80989F84: -/* 01104 80989F84 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) -/* 01108 80989F88 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 0110C 80989F8C 54410011 */ bnel $v0, $at, .L80989FD4 -/* 01110 80989F90 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -/* 01114 80989F94 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 01118 80989F98 C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 0111C 80989F9C 461E6281 */ sub.s $f10, $f12, $f30 -/* 01120 80989FA0 46122380 */ add.s $f14, $f4, $f18 -/* 01124 80989FA4 460A703C */ c.lt.s $f14, $f10 -/* 01128 80989FA8 00000000 */ nop -/* 0112C 80989FAC 45020034 */ bc1fl .L8098A080 -/* 01130 80989FB0 C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -/* 01134 80989FB4 926E0172 */ lbu $t6, 0x0172($s3) ## 00000172 -/* 01138 80989FB8 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 0113C 80989FBC C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 01140 80989FC0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01144 80989FC4 A26F0172 */ sb $t7, 0x0172($s3) ## 00000172 -/* 01148 80989FC8 1000002C */ beq $zero, $zero, .L8098A07C -/* 0114C 80989FCC 46083380 */ add.s $f14, $f6, $f8 -/* 01150 80989FD0 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -.L80989FD4: -/* 01154 80989FD4 54410011 */ bnel $v0, $at, .L8098A01C -/* 01158 80989FD8 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 0115C 80989FDC C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 01160 80989FE0 C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 01164 80989FE4 461E6280 */ add.s $f10, $f12, $f30 -/* 01168 80989FE8 46122380 */ add.s $f14, $f4, $f18 -/* 0116C 80989FEC 460E503C */ c.lt.s $f10, $f14 -/* 01170 80989FF0 00000000 */ nop -/* 01174 80989FF4 45020022 */ bc1fl .L8098A080 -/* 01178 80989FF8 C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -/* 0117C 80989FFC 92780172 */ lbu $t8, 0x0172($s3) ## 00000172 -/* 01180 8098A000 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 01184 8098A004 C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 01188 8098A008 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0118C 8098A00C A2790172 */ sb $t9, 0x0172($s3) ## 00000172 -/* 01190 8098A010 1000001A */ beq $zero, $zero, .L8098A07C -/* 01194 8098A014 46083380 */ add.s $f14, $f6, $f8 -/* 01198 8098A018 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -.L8098A01C: -/* 0119C 8098A01C C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 011A0 8098A020 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 011A4 8098A024 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 -/* 011A8 8098A028 46122380 */ add.s $f14, $f4, $f18 -/* 011AC 8098A02C 460E503C */ c.lt.s $f10, $f14 -/* 011B0 8098A030 00000000 */ nop -/* 011B4 8098A034 45020012 */ bc1fl .L8098A080 -/* 011B8 8098A038 C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -/* 011BC 8098A03C 92680172 */ lbu $t0, 0x0172($s3) ## 00000172 -/* 011C0 8098A040 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 011C4 8098A044 C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 011C8 8098A048 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 011CC 8098A04C A2690172 */ sb $t1, 0x0172($s3) ## 00000172 -/* 011D0 8098A050 1000000A */ beq $zero, $zero, .L8098A07C -/* 011D4 8098A054 46083380 */ add.s $f14, $f6, $f8 -.L8098A058: -/* 011D8 8098A058 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 -/* 011DC 8098A05C 0C2626D5 */ jal func_80989B54 -/* 011E0 8098A060 87A600DE */ lh $a2, 0x00DE($sp) -/* 011E4 8098A064 926A0172 */ lbu $t2, 0x0172($s3) ## 00000172 -/* 011E8 8098A068 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 011EC 8098A06C C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 011F0 8098A070 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF -/* 011F4 8098A074 A26B0172 */ sb $t3, 0x0172($s3) ## 00000172 -/* 011F8 8098A078 46122380 */ add.s $f14, $f4, $f18 -.L8098A07C: -/* 011FC 8098A07C C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -.L8098A080: -/* 01200 8098A080 C6640164 */ lwc1 $f4, 0x0164($s3) ## 00000164 -/* 01204 8098A084 C66A0150 */ lwc1 $f10, 0x0150($s3) ## 00000150 -/* 01208 8098A088 C666015C */ lwc1 $f6, 0x015C($s3) ## 0000015C -/* 0120C 8098A08C 46044480 */ add.s $f18, $f8, $f4 -/* 01210 8098A090 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01214 8098A094 46065300 */ add.s $f12, $f10, $f6 -/* 01218 8098A098 44069000 */ mfc1 $a2, $f18 -/* 0121C 8098A09C 0C034261 */ jal Matrix_Translate -/* 01220 8098A0A0 00000000 */ nop -/* 01224 8098A0A4 3C0C8016 */ lui $t4, %hi(gSaveContext) -/* 01228 8098A0A8 8D8CE660 */ lw $t4, %lo(gSaveContext)($t4) -/* 0122C 8098A0AC 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 01230 8098A0B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01234 8098A0B4 11810003 */ beq $t4, $at, .L8098A0C4 -/* 01238 8098A0B8 3C018099 */ lui $at, %hi(D_8098CB30) ## $at = 80990000 -/* 0123C 8098A0BC 0C0342DC */ jal Matrix_RotateX -/* 01240 8098A0C0 C42CCB30 */ lwc1 $f12, %lo(D_8098CB30)($at) -.L8098A0C4: -/* 01244 8098A0C4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01248 8098A0C8 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 0124C 8098A0CC 3C0F8016 */ lui $t7, %hi(gSaveContext) -/* 01250 8098A0D0 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 01254 8098A0D4 AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 -/* 01258 8098A0D8 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 0125C 8098A0DC AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 01260 8098A0E0 8DEFE660 */ lw $t7, %lo(gSaveContext)($t7) -/* 01264 8098A0E4 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -/* 01268 8098A0E8 3C0EC8FF */ lui $t6, 0xC8FF ## $t6 = C8FF0000 -/* 0126C 8098A0EC 15E10011 */ bne $t7, $at, .L8098A134 -/* 01270 8098A0F0 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 01274 8098A0F4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01278 8098A0F8 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 0127C 8098A0FC 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 01280 8098A100 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 01284 8098A104 AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0 -/* 01288 8098A108 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 0128C 8098A10C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 01290 8098A110 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01294 8098A114 3C0BFFFF */ lui $t3, 0xFFFF ## $t3 = FFFF0000 -/* 01298 8098A118 356B00FF */ ori $t3, $t3, 0x00FF ## $t3 = FFFF00FF -/* 0129C 8098A11C 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 012A0 8098A120 AE4902D0 */ sw $t1, 0x02D0($s2) ## 000002D0 -/* 012A4 8098A124 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 012A8 8098A128 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 012AC 8098A12C 1000000F */ beq $zero, $zero, .L8098A16C -/* 012B0 8098A130 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -.L8098A134: -/* 012B4 8098A134 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 012B8 8098A138 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = C8FFFFFF -/* 012BC 8098A13C 3C190096 */ lui $t9, 0x0096 ## $t9 = 00960000 -/* 012C0 8098A140 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 012C4 8098A144 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 -/* 012C8 8098A148 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 012CC 8098A14C AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 012D0 8098A150 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 012D4 8098A154 3739FFFF */ ori $t9, $t9, 0xFFFF ## $t9 = 0096FFFF -/* 012D8 8098A158 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 012DC 8098A15C 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 012E0 8098A160 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 012E4 8098A164 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 012E8 8098A168 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -.L8098A16C: -/* 012EC 8098A16C 3C088099 */ lui $t0, %hi(D_8098CF82) ## $t0 = 80990000 -/* 012F0 8098A170 8508CF82 */ lh $t0, %lo(D_8098CF82)($t0) -/* 012F4 8098A174 3C018099 */ lui $at, %hi(D_8098CB34) ## $at = 80990000 -/* 012F8 8098A178 C428CB34 */ lwc1 $f8, %lo(D_8098CB34)($at) -/* 012FC 8098A17C 44885000 */ mtc1 $t0, $f10 ## $f10 = -0.00 -/* 01300 8098A180 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01304 8098A184 468051A0 */ cvt.s.w $f6, $f10 -/* 01308 8098A188 46083302 */ mul.s $f12, $f6, $f8 -/* 0130C 8098A18C 44066000 */ mfc1 $a2, $f12 -/* 01310 8098A190 0C0342A3 */ jal Matrix_Scale -/* 01314 8098A194 46006386 */ mov.s $f14, $f12 -/* 01318 8098A198 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -.L8098A19C: -/* 0131C 8098A19C 86A900A4 */ lh $t1, 0x00A4($s5) ## 000000A4 -/* 01320 8098A1A0 320C0001 */ andi $t4, $s0, 0x0001 ## $t4 = 00000000 -/* 01324 8098A1A4 52C90032 */ beql $s6, $t1, .L8098A270 -/* 01328 8098A1A8 44904000 */ mtc1 $s0, $f8 ## $f8 = 0.00 -/* 0132C 8098A1AC C6640150 */ lwc1 $f4, 0x0150($s3) ## 00000150 -/* 01330 8098A1B0 00105023 */ subu $t2, $zero, $s0 -/* 01334 8098A1B4 00105823 */ subu $t3, $zero, $s0 -/* 01338 8098A1B8 4604A03E */ c.le.s $f20, $f4 -/* 0133C 8098A1BC 00106823 */ subu $t5, $zero, $s0 -/* 01340 8098A1C0 45020008 */ bc1fl .L8098A1E4 -/* 01344 8098A1C4 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -/* 01348 8098A1C8 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 0134C 8098A1CC 00000000 */ nop -/* 01350 8098A1D0 468092A0 */ cvt.s.w $f10, $f18 -/* 01354 8098A1D4 46165302 */ mul.s $f12, $f10, $f22 -/* 01358 8098A1D8 10000007 */ beq $zero, $zero, .L8098A1F8 -/* 0135C 8098A1DC C6640158 */ lwc1 $f4, 0x0158($s3) ## 00000158 -/* 01360 8098A1E0 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -.L8098A1E4: -/* 01364 8098A1E4 00000000 */ nop -/* 01368 8098A1E8 46803220 */ cvt.s.w $f8, $f6 -/* 0136C 8098A1EC 46164302 */ mul.s $f12, $f8, $f22 -/* 01370 8098A1F0 00000000 */ nop -/* 01374 8098A1F4 C6640158 */ lwc1 $f4, 0x0158($s3) ## 00000158 -.L8098A1F8: -/* 01378 8098A1F8 4604A03E */ c.le.s $f20, $f4 -/* 0137C 8098A1FC 00000000 */ nop -/* 01380 8098A200 45020008 */ bc1fl .L8098A224 -/* 01384 8098A204 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -/* 01388 8098A208 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 0138C 8098A20C 00000000 */ nop -/* 01390 8098A210 468092A0 */ cvt.s.w $f10, $f18 -/* 01394 8098A214 46165002 */ mul.s $f0, $f10, $f22 -/* 01398 8098A218 10000006 */ beq $zero, $zero, .L8098A234 -/* 0139C 8098A21C 00000000 */ nop -/* 013A0 8098A220 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -.L8098A224: -/* 013A4 8098A224 00000000 */ nop -/* 013A8 8098A228 46803220 */ cvt.s.w $f8, $f6 -/* 013AC 8098A22C 46164002 */ mul.s $f0, $f8, $f22 -/* 013B0 8098A230 00000000 */ nop -.L8098A234: -/* 013B4 8098A234 51800008 */ beql $t4, $zero, .L8098A258 -/* 013B8 8098A238 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 013BC 8098A23C 44902000 */ mtc1 $s0, $f4 ## $f4 = 0.00 -/* 013C0 8098A240 00000000 */ nop -/* 013C4 8098A244 468024A0 */ cvt.s.w $f18, $f4 -/* 013C8 8098A248 46189382 */ mul.s $f14, $f18, $f24 -/* 013CC 8098A24C 1000000E */ beq $zero, $zero, .L8098A288 -/* 013D0 8098A250 44060000 */ mfc1 $a2, $f0 -/* 013D4 8098A254 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -.L8098A258: -/* 013D8 8098A258 00000000 */ nop -/* 013DC 8098A25C 468051A0 */ cvt.s.w $f6, $f10 -/* 013E0 8098A260 46183382 */ mul.s $f14, $f6, $f24 -/* 013E4 8098A264 10000008 */ beq $zero, $zero, .L8098A288 -/* 013E8 8098A268 44060000 */ mfc1 $a2, $f0 -/* 013EC 8098A26C 44904000 */ mtc1 $s0, $f8 ## $f8 = 0.00 -.L8098A270: -/* 013F0 8098A270 4600A306 */ mov.s $f12, $f20 -/* 013F4 8098A274 4600A006 */ mov.s $f0, $f20 -/* 013F8 8098A278 46804120 */ cvt.s.w $f4, $f8 -/* 013FC 8098A27C 461A2382 */ mul.s $f14, $f4, $f26 -/* 01400 8098A280 00000000 */ nop -/* 01404 8098A284 44060000 */ mfc1 $a2, $f0 -.L8098A288: -/* 01408 8098A288 0C034261 */ jal Matrix_Translate -/* 0140C 8098A28C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01410 8098A290 8E5102D0 */ lw $s1, 0x02D0($s2) ## 000002D0 -/* 01414 8098A294 03C02825 */ or $a1, $s8, $zero ## $a1 = 8098C8AC -/* 01418 8098A298 24060540 */ addiu $a2, $zero, 0x0540 ## $a2 = 00000540 -/* 0141C 8098A29C 262E0008 */ addiu $t6, $s1, 0x0008 ## $t6 = 00000008 -/* 01420 8098A2A0 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 -/* 01424 8098A2A4 AE370000 */ sw $s7, 0x0000($s1) ## 00000000 -/* 01428 8098A2A8 0C0346A2 */ jal Matrix_NewMtx -/* 0142C 8098A2AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 -/* 01430 8098A2B0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 01434 8098A2B4 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 -/* 01438 8098A2B8 0C024DDD */ jal Gfx_CallSetupDL -/* 0143C 8098A2BC 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 01440 8098A2C0 AE4202D0 */ sw $v0, 0x02D0($s2) ## 000002D0 -/* 01444 8098A2C4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01448 8098A2C8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0144C 8098A2CC AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 01450 8098A2D0 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 01454 8098A2D4 00108400 */ sll $s0, $s0, 16 -/* 01458 8098A2D8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0145C 8098A2DC 8FB90074 */ lw $t9, 0x0074($sp) -/* 01460 8098A2E0 00108403 */ sra $s0, $s0, 16 -/* 01464 8098A2E4 2A010005 */ slti $at, $s0, 0x0005 -/* 01468 8098A2E8 1420FFAC */ bne $at, $zero, .L8098A19C -/* 0146C 8098A2EC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01470 8098A2F0 87A800DE */ lh $t0, 0x00DE($sp) -/* 01474 8098A2F4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 01478 8098A2F8 00095400 */ sll $t2, $t1, 16 -/* 0147C 8098A2FC 000A5C03 */ sra $t3, $t2, 16 -/* 01480 8098A300 2961001E */ slti $at, $t3, 0x001E -/* 01484 8098A304 1420FEB5 */ bne $at, $zero, .L80989DDC -/* 01488 8098A308 A7A900DE */ sh $t1, 0x00DE($sp) -/* 0148C 8098A30C 3C068099 */ lui $a2, %hi(D_8098C8C0) ## $a2 = 80990000 -/* 01490 8098A310 24C6C8C0 */ addiu $a2, $a2, %lo(D_8098C8C0) ## $a2 = 8098C8C0 -/* 01494 8098A314 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 -/* 01498 8098A318 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 0149C 8098A31C 0C031AD5 */ jal Graph_CloseDisps -/* 014A0 8098A320 2407054E */ addiu $a3, $zero, 0x054E ## $a3 = 0000054E -/* 014A4 8098A324 8FBF006C */ lw $ra, 0x006C($sp) -/* 014A8 8098A328 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 014AC 8098A32C D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 014B0 8098A330 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 014B4 8098A334 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 014B8 8098A338 D7BC0038 */ ldc1 $f28, 0x0038($sp) -/* 014BC 8098A33C D7BE0040 */ ldc1 $f30, 0x0040($sp) -/* 014C0 8098A340 8FB00048 */ lw $s0, 0x0048($sp) -/* 014C4 8098A344 8FB1004C */ lw $s1, 0x004C($sp) -/* 014C8 8098A348 8FB20050 */ lw $s2, 0x0050($sp) -/* 014CC 8098A34C 8FB30054 */ lw $s3, 0x0054($sp) -/* 014D0 8098A350 8FB40058 */ lw $s4, 0x0058($sp) -/* 014D4 8098A354 8FB5005C */ lw $s5, 0x005C($sp) -/* 014D8 8098A358 8FB60060 */ lw $s6, 0x0060($sp) -/* 014DC 8098A35C 8FB70064 */ lw $s7, 0x0064($sp) -/* 014E0 8098A360 8FBE0068 */ lw $s8, 0x0068($sp) -/* 014E4 8098A364 03E00008 */ jr $ra -/* 014E8 8098A368 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s deleted file mode 100644 index 34a48e02ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s +++ /dev/null @@ -1,120 +0,0 @@ -.rdata -glabel D_8098C8D4 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8E8 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8FC - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB38 - .word 0x3C8EFA35 -glabel D_8098CB3C - .word 0x3C8EFA35 -glabel D_8098CB40 - .word 0x3C8EFA35 - -.text -glabel func_8098A36C -/* 014EC 8098A36C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 014F0 8098A370 AFBF001C */ sw $ra, 0x001C($sp) -/* 014F4 8098A374 AFB10018 */ sw $s1, 0x0018($sp) -/* 014F8 8098A378 AFB00014 */ sw $s0, 0x0014($sp) -/* 014FC 8098A37C AFA50054 */ sw $a1, 0x0054($sp) -/* 01500 8098A380 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01504 8098A384 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01508 8098A388 3C068099 */ lui $a2, %hi(D_8098C8D4) ## $a2 = 80990000 -/* 0150C 8098A38C 24C6C8D4 */ addiu $a2, $a2, %lo(D_8098C8D4) ## $a2 = 8098C8D4 -/* 01510 8098A390 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01514 8098A394 24070560 */ addiu $a3, $zero, 0x0560 ## $a3 = 00000560 -/* 01518 8098A398 0C031AB1 */ jal Graph_OpenDisps -/* 0151C 8098A39C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01520 8098A3A0 8FAF0054 */ lw $t7, 0x0054($sp) -/* 01524 8098A3A4 0C024F46 */ jal func_80093D18 -/* 01528 8098A3A8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0152C 8098A3AC C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 01530 8098A3B0 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 01534 8098A3B4 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 01538 8098A3B8 0C034261 */ jal Matrix_Translate -/* 0153C 8098A3BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01540 8098A3C0 3C018099 */ lui $at, %hi(D_8098CB38) ## $at = 80990000 -/* 01544 8098A3C4 C426CB38 */ lwc1 $f6, %lo(D_8098CB38)($at) -/* 01548 8098A3C8 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 0154C 8098A3CC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01550 8098A3D0 46062302 */ mul.s $f12, $f4, $f6 -/* 01554 8098A3D4 0C0342DC */ jal Matrix_RotateX -/* 01558 8098A3D8 00000000 */ nop -/* 0155C 8098A3DC 3C018099 */ lui $at, %hi(D_8098CB3C) ## $at = 80990000 -/* 01560 8098A3E0 C42ACB3C */ lwc1 $f10, %lo(D_8098CB3C)($at) -/* 01564 8098A3E4 C6080160 */ lwc1 $f8, 0x0160($s0) ## 00000160 -/* 01568 8098A3E8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0156C 8098A3EC 460A4302 */ mul.s $f12, $f8, $f10 -/* 01570 8098A3F0 0C034348 */ jal Matrix_RotateY -/* 01574 8098A3F4 00000000 */ nop -/* 01578 8098A3F8 3C018099 */ lui $at, %hi(D_8098CB40) ## $at = 80990000 -/* 0157C 8098A3FC C432CB40 */ lwc1 $f18, %lo(D_8098CB40)($at) -/* 01580 8098A400 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 01584 8098A404 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01588 8098A408 46128302 */ mul.s $f12, $f16, $f18 -/* 0158C 8098A40C 0C0343B5 */ jal Matrix_RotateZ -/* 01590 8098A410 00000000 */ nop -/* 01594 8098A414 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 01598 8098A418 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 0159C 8098A41C 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 015A0 8098A420 0C0342A3 */ jal Matrix_Scale -/* 015A4 8098A424 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015A8 8098A428 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 015AC 8098A42C 3C08FF9B */ lui $t0, 0xFF9B ## $t0 = FF9B0000 -/* 015B0 8098A430 350837FF */ ori $t0, $t0, 0x37FF ## $t0 = FF9B37FF -/* 015B4 8098A434 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 015B8 8098A438 AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 -/* 015BC 8098A43C 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 015C0 8098A440 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 015C4 8098A444 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 015C8 8098A448 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 015CC 8098A44C 3C0B9BFF */ lui $t3, 0x9BFF ## $t3 = 9BFF0000 -/* 015D0 8098A450 356B37FF */ ori $t3, $t3, 0x37FF ## $t3 = 9BFF37FF -/* 015D4 8098A454 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 015D8 8098A458 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 015DC 8098A45C 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 015E0 8098A460 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 015E4 8098A464 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 015E8 8098A468 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 015EC 8098A46C 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 015F0 8098A470 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 015F4 8098A474 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 015F8 8098A478 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 -/* 015FC 8098A47C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01600 8098A480 8FAE0054 */ lw $t6, 0x0054($sp) -/* 01604 8098A484 3C058099 */ lui $a1, %hi(D_8098C8E8) ## $a1 = 80990000 -/* 01608 8098A488 24A5C8E8 */ addiu $a1, $a1, %lo(D_8098C8E8) ## $a1 = 8098C8E8 -/* 0160C 8098A48C 2406057C */ addiu $a2, $zero, 0x057C ## $a2 = 0000057C -/* 01610 8098A490 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01614 8098A494 0C0346A2 */ jal Matrix_NewMtx -/* 01618 8098A498 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 0161C 8098A49C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 01620 8098A4A0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 01624 8098A4A4 3C190600 */ lui $t9, %hi(D_06000DE0) ## $t9 = 06000000 -/* 01628 8098A4A8 27390DE0 */ addiu $t9, $t9, %lo(D_06000DE0) ## $t9 = 06000DE0 -/* 0162C 8098A4AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01630 8098A4B0 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 -/* 01634 8098A4B4 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 01638 8098A4B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0163C 8098A4BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01640 8098A4C0 8FA80054 */ lw $t0, 0x0054($sp) -/* 01644 8098A4C4 3C068099 */ lui $a2, %hi(D_8098C8FC) ## $a2 = 80990000 -/* 01648 8098A4C8 24C6C8FC */ addiu $a2, $a2, %lo(D_8098C8FC) ## $a2 = 8098C8FC -/* 0164C 8098A4CC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01650 8098A4D0 24070581 */ addiu $a3, $zero, 0x0581 ## $a3 = 00000581 -/* 01654 8098A4D4 0C031AD5 */ jal Graph_CloseDisps -/* 01658 8098A4D8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 0165C 8098A4DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01660 8098A4E0 8FB00014 */ lw $s0, 0x0014($sp) -/* 01664 8098A4E4 8FB10018 */ lw $s1, 0x0018($sp) -/* 01668 8098A4E8 03E00008 */ jr $ra -/* 0166C 8098A4EC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s deleted file mode 100644 index 21d515c1d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s +++ /dev/null @@ -1,236 +0,0 @@ -.rdata -glabel D_8098C910 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C924 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C938 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.text -glabel func_8098A4F0 -/* 01670 8098A4F0 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 01674 8098A4F4 AFB30054 */ sw $s3, 0x0054($sp) -/* 01678 8098A4F8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0167C 8098A4FC AFBF006C */ sw $ra, 0x006C($sp) -/* 01680 8098A500 AFBE0068 */ sw $s8, 0x0068($sp) -/* 01684 8098A504 AFB70064 */ sw $s7, 0x0064($sp) -/* 01688 8098A508 AFB60060 */ sw $s6, 0x0060($sp) -/* 0168C 8098A50C AFB5005C */ sw $s5, 0x005C($sp) -/* 01690 8098A510 AFB40058 */ sw $s4, 0x0058($sp) -/* 01694 8098A514 AFB20050 */ sw $s2, 0x0050($sp) -/* 01698 8098A518 AFB1004C */ sw $s1, 0x004C($sp) -/* 0169C 8098A51C AFB00048 */ sw $s0, 0x0048($sp) -/* 016A0 8098A520 F7BE0040 */ sdc1 $f30, 0x0040($sp) -/* 016A4 8098A524 F7BC0038 */ sdc1 $f28, 0x0038($sp) -/* 016A8 8098A528 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 016AC 8098A52C F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 016B0 8098A530 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 016B4 8098A534 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 016B8 8098A538 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 016BC 8098A53C 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 016C0 8098A540 3C068099 */ lui $a2, %hi(D_8098C910) ## $a2 = 80990000 -/* 016C4 8098A544 24C6C910 */ addiu $a2, $a2, %lo(D_8098C910) ## $a2 = 8098C910 -/* 016C8 8098A548 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 -/* 016CC 8098A54C 24070591 */ addiu $a3, $zero, 0x0591 ## $a3 = 00000591 -/* 016D0 8098A550 0C031AB1 */ jal Graph_OpenDisps -/* 016D4 8098A554 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 016D8 8098A558 3C020405 */ lui $v0, %hi(gDust5Tex) ## $v0 = 04050000 -/* 016DC 8098A55C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 016E0 8098A560 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 016E4 8098A564 24422DB0 */ addiu $v0, $v0, %lo(gDust5Tex) ## $v0 = 04052DB0 -/* 016E8 8098A568 0041B824 */ and $s7, $v0, $at -/* 016EC 8098A56C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 016F0 8098A570 4481F000 */ mtc1 $at, $f30 ## $f30 = 30.00 -/* 016F4 8098A574 00027100 */ sll $t6, $v0, 4 -/* 016F8 8098A578 000E7F02 */ srl $t7, $t6, 28 -/* 016FC 8098A57C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 01700 8098A580 3C198016 */ lui $t9, %hi(gSegments) -/* 01704 8098A584 3C080401 */ lui $t0, %hi(gEffDustDL) ## $t0 = 04010000 -/* 01708 8098A588 25080050 */ addiu $t0, $t0, %lo(gEffDustDL) ## $t0 = 04010050 -/* 0170C 8098A58C 27396FA8 */ addiu $t9, %lo(gSegments) -/* 01710 8098A590 000FC080 */ sll $t8, $t7, 2 -/* 01714 8098A594 3C1E0100 */ lui $s8, %hi(D_01000000) ## $s8 = 01000000 -/* 01718 8098A598 3C15E300 */ lui $s5, 0xE300 ## $s5 = E3000000 -/* 0171C 8098A59C 4481E000 */ mtc1 $at, $f28 ## $f28 = 120.00 -/* 01720 8098A5A0 36B51801 */ ori $s5, $s5, 0x1801 ## $s5 = E3001801 -/* 01724 8098A5A4 27DE0000 */ addiu $s8, $s8, %lo(D_01000000) ## $s8 = 01000000 -/* 01728 8098A5A8 0319B021 */ addu $s6, $t8, $t9 -/* 0172C 8098A5AC AFA80078 */ sw $t0, 0x0078($sp) -/* 01730 8098A5B0 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -.L8098A5B4: -/* 01734 8098A5B4 00124880 */ sll $t1, $s2, 2 -/* 01738 8098A5B8 01324821 */ addu $t1, $t1, $s2 -/* 0173C 8098A5BC 000948C0 */ sll $t1, $t1, 3 -/* 01740 8098A5C0 02898821 */ addu $s1, $s4, $t1 -/* 01744 8098A5C4 86240170 */ lh $a0, 0x0170($s1) ## 00000170 -/* 01748 8098A5C8 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 0174C 8098A5CC 00812021 */ addu $a0, $a0, $at -/* 01750 8098A5D0 00042400 */ sll $a0, $a0, 16 -/* 01754 8098A5D4 0C01DE1C */ jal Math_SinS - ## sins? -/* 01758 8098A5D8 00042403 */ sra $a0, $a0, 16 -/* 0175C 8098A5DC 44922000 */ mtc1 $s2, $f4 ## $f4 = 0.00 -/* 01760 8098A5E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01764 8098A5E4 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01768 8098A5E8 46802520 */ cvt.s.w $f20, $f4 -/* 0176C 8098A5EC 86240170 */ lh $a0, 0x0170($s1) ## 00000170 -/* 01770 8098A5F0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 01774 8098A5F4 00812021 */ addu $a0, $a0, $at -/* 01778 8098A5F8 00042400 */ sll $a0, $a0, 16 -/* 0177C 8098A5FC 461EA183 */ div.s $f6, $f20, $f30 -/* 01780 8098A600 00042403 */ sra $a0, $a0, 16 -/* 01784 8098A604 46083282 */ mul.s $f10, $f6, $f8 -/* 01788 8098A608 00000000 */ nop -/* 0178C 8098A60C 461C0402 */ mul.s $f16, $f0, $f28 -/* 01790 8098A610 460AF580 */ add.s $f22, $f30, $f10 -/* 01794 8098A614 46008487 */ neg.s $f18, $f16 -/* 01798 8098A618 46169602 */ mul.s $f24, $f18, $f22 -/* 0179C 8098A61C 0C01DE0D */ jal Math_CosS - ## coss? -/* 017A0 8098A620 00000000 */ nop -/* 017A4 8098A624 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 017A8 8098A628 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 017AC 8098A62C 86240170 */ lh $a0, 0x0170($s1) ## 00000170 -/* 017B0 8098A630 3C014496 */ lui $at, 0x4496 ## $at = 44960000 -/* 017B4 8098A634 46040182 */ mul.s $f6, $f0, $f4 -/* 017B8 8098A638 44814000 */ mtc1 $at, $f8 ## $f8 = 1200.00 -/* 017BC 8098A63C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 017C0 8098A640 00812021 */ addu $a0, $a0, $at -/* 017C4 8098A644 00042400 */ sll $a0, $a0, 16 -/* 017C8 8098A648 00042403 */ sra $a0, $a0, 16 -/* 017CC 8098A64C 0C01DE0D */ jal Math_CosS - ## coss? -/* 017D0 8098A650 46083680 */ add.s $f26, $f6, $f8 -/* 017D4 8098A654 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 017D8 8098A658 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 017DC 8098A65C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 017E0 8098A660 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 -/* 017E4 8098A664 4610A481 */ sub.s $f18, $f20, $f16 -/* 017E8 8098A668 C66A00E0 */ lwc1 $f10, 0x00E0($s3) ## 000000E0 -/* 017EC 8098A66C C66800E4 */ lwc1 $f8, 0x00E4($s3) ## 000000E4 -/* 017F0 8098A670 C67000E8 */ lwc1 $f16, 0x00E8($s3) ## 000000E8 -/* 017F4 8098A674 46049182 */ mul.s $f6, $f18, $f4 -/* 017F8 8098A678 46185300 */ add.s $f12, $f10, $f24 -/* 017FC 8098A67C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01800 8098A680 461C0482 */ mul.s $f18, $f0, $f28 -/* 01804 8098A684 461A4280 */ add.s $f10, $f8, $f26 -/* 01808 8098A688 46065380 */ add.s $f14, $f10, $f6 -/* 0180C 8098A68C 46169102 */ mul.s $f4, $f18, $f22 -/* 01810 8098A690 46048200 */ add.s $f8, $f16, $f4 -/* 01814 8098A694 44064000 */ mfc1 $a2, $f8 -/* 01818 8098A698 0C034261 */ jal Matrix_Translate -/* 0181C 8098A69C 00000000 */ nop -/* 01820 8098A6A0 3C0142FA */ lui $at, 0x42FA ## $at = 42FA0000 -/* 01824 8098A6A4 44816000 */ mtc1 $at, $f12 ## $f12 = 125.00 -/* 01828 8098A6A8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0182C 8098A6AC 44817000 */ mtc1 $at, $f14 ## $f14 = 60.00 -/* 01830 8098A6B0 44066000 */ mfc1 $a2, $f12 -/* 01834 8098A6B4 0C0342A3 */ jal Matrix_Scale -/* 01838 8098A6B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0183C 8098A6BC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01840 8098A6C0 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 -/* 01844 8098A6C4 3C0ED2D2 */ lui $t6, 0xD2D2 ## $t6 = D2D20000 -/* 01848 8098A6C8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0184C 8098A6CC AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 01850 8098A6D0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01854 8098A6D4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 01858 8098A6D8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0185C 8098A6DC 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = D2D2FFFF -/* 01860 8098A6E0 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 01864 8098A6E4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01868 8098A6E8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 0186C 8098A6EC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01870 8098A6F0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01874 8098A6F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01878 8098A6F8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 0187C 8098A6FC 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 01880 8098A700 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01884 8098A704 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 01888 8098A708 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0188C 8098A70C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01890 8098A710 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01894 8098A714 240900C0 */ addiu $t1, $zero, 0x00C0 ## $t1 = 000000C0 -/* 01898 8098A718 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 0189C 8098A71C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 018A0 8098A720 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 018A4 8098A724 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 018A8 8098A728 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 018AC 8098A72C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 018B0 8098A730 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 018B4 8098A734 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 018B8 8098A738 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 018BC 8098A73C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 018C0 8098A740 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 018C4 8098A744 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 018C8 8098A748 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 018CC 8098A74C 3C058099 */ lui $a1, %hi(D_8098C924) ## $a1 = 80990000 -/* 018D0 8098A750 24A5C924 */ addiu $a1, $a1, %lo(D_8098C924) ## $a1 = 8098C924 -/* 018D4 8098A754 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 018D8 8098A758 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 018DC 8098A75C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 018E0 8098A760 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 018E4 8098A764 240605B5 */ addiu $a2, $zero, 0x05B5 ## $a2 = 000005B5 -/* 018E8 8098A768 0C0346A2 */ jal Matrix_NewMtx -/* 018EC 8098A76C 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 018F0 8098A770 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 018F4 8098A774 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 018F8 8098A778 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 018FC 8098A77C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 01900 8098A780 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01904 8098A784 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 01908 8098A788 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0190C 8098A78C 8ED80000 */ lw $t8, 0x0000($s6) ## 00000000 -/* 01910 8098A790 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01914 8098A794 0317C821 */ addu $t9, $t8, $s7 -/* 01918 8098A798 03214021 */ addu $t0, $t9, $at -/* 0191C 8098A79C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 01920 8098A7A0 0C025314 */ jal func_80094C50 -/* 01924 8098A7A4 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 01928 8098A7A8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0192C 8098A7AC 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 01930 8098A7B0 354A0001 */ ori $t2, $t2, 0x0001 ## $t2 = DA380001 -/* 01934 8098A7B4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01938 8098A7B8 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 0193C 8098A7BC AC5E0004 */ sw $s8, 0x0004($v0) ## 00000004 -/* 01940 8098A7C0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01944 8098A7C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01948 8098A7C8 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 0194C 8098A7CC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 01950 8098A7D0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01954 8098A7D4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 01958 8098A7D8 00129400 */ sll $s2, $s2, 16 -/* 0195C 8098A7DC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01960 8098A7E0 8FAD0078 */ lw $t5, 0x0078($sp) -/* 01964 8098A7E4 00129403 */ sra $s2, $s2, 16 -/* 01968 8098A7E8 2A41001E */ slti $at, $s2, 0x001E -/* 0196C 8098A7EC 1420FF71 */ bne $at, $zero, .L8098A5B4 -/* 01970 8098A7F0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01974 8098A7F4 3C068099 */ lui $a2, %hi(D_8098C938) ## $a2 = 80990000 -/* 01978 8098A7F8 24C6C938 */ addiu $a2, $a2, %lo(D_8098C938) ## $a2 = 8098C938 -/* 0197C 8098A7FC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 -/* 01980 8098A800 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 01984 8098A804 0C031AD5 */ jal Graph_CloseDisps -/* 01988 8098A808 240705C2 */ addiu $a3, $zero, 0x05C2 ## $a3 = 000005C2 -/* 0198C 8098A80C 8FBF006C */ lw $ra, 0x006C($sp) -/* 01990 8098A810 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 01994 8098A814 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 01998 8098A818 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 0199C 8098A81C D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 019A0 8098A820 D7BC0038 */ ldc1 $f28, 0x0038($sp) -/* 019A4 8098A824 D7BE0040 */ ldc1 $f30, 0x0040($sp) -/* 019A8 8098A828 8FB00048 */ lw $s0, 0x0048($sp) -/* 019AC 8098A82C 8FB1004C */ lw $s1, 0x004C($sp) -/* 019B0 8098A830 8FB20050 */ lw $s2, 0x0050($sp) -/* 019B4 8098A834 8FB30054 */ lw $s3, 0x0054($sp) -/* 019B8 8098A838 8FB40058 */ lw $s4, 0x0058($sp) -/* 019BC 8098A83C 8FB5005C */ lw $s5, 0x005C($sp) -/* 019C0 8098A840 8FB60060 */ lw $s6, 0x0060($sp) -/* 019C4 8098A844 8FB70064 */ lw $s7, 0x0064($sp) -/* 019C8 8098A848 8FBE0068 */ lw $s8, 0x0068($sp) -/* 019CC 8098A84C 03E00008 */ jr $ra -/* 019D0 8098A850 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s deleted file mode 100644 index e472c9b0c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s +++ /dev/null @@ -1,103 +0,0 @@ -.rdata -glabel D_8098C94C - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C960 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C974 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C988 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.text -glabel func_8098A854 -/* 019D4 8098A854 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 019D8 8098A858 AFB10018 */ sw $s1, 0x0018($sp) -/* 019DC 8098A85C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 019E0 8098A860 AFBF001C */ sw $ra, 0x001C($sp) -/* 019E4 8098A864 AFB00014 */ sw $s0, 0x0014($sp) -/* 019E8 8098A868 AFA40050 */ sw $a0, 0x0050($sp) -/* 019EC 8098A86C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 019F0 8098A870 3C068099 */ lui $a2, %hi(D_8098C94C) ## $a2 = 80990000 -/* 019F4 8098A874 24C6C94C */ addiu $a2, $a2, %lo(D_8098C94C) ## $a2 = 8098C94C -/* 019F8 8098A878 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 019FC 8098A87C 240705CF */ addiu $a3, $zero, 0x05CF ## $a3 = 000005CF -/* 01A00 8098A880 0C031AB1 */ jal Graph_OpenDisps -/* 01A04 8098A884 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01A08 8098A888 0C024F46 */ jal func_80093D18 -/* 01A0C 8098A88C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01A10 8098A890 8FAE0050 */ lw $t6, 0x0050($sp) -/* 01A14 8098A894 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01A18 8098A898 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01A1C 8098A89C C5CC0168 */ lwc1 $f12, 0x0168($t6) ## 00000168 -/* 01A20 8098A8A0 44067000 */ mfc1 $a2, $f14 -/* 01A24 8098A8A4 0C034261 */ jal Matrix_Translate -/* 01A28 8098A8A8 46006307 */ neg.s $f12, $f12 -/* 01A2C 8098A8AC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01A30 8098A8B0 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 01A34 8098A8B4 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 01A38 8098A8B8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01A3C 8098A8BC AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 01A40 8098A8C0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01A44 8098A8C4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01A48 8098A8C8 3C058099 */ lui $a1, %hi(D_8098C960) ## $a1 = 80990000 -/* 01A4C 8098A8CC 24A5C960 */ addiu $a1, $a1, %lo(D_8098C960) ## $a1 = 8098C960 -/* 01A50 8098A8D0 240605D4 */ addiu $a2, $zero, 0x05D4 ## $a2 = 000005D4 -/* 01A54 8098A8D4 0C0346A2 */ jal Matrix_NewMtx -/* 01A58 8098A8D8 AFA20030 */ sw $v0, 0x0030($sp) -/* 01A5C 8098A8DC 8FA30030 */ lw $v1, 0x0030($sp) -/* 01A60 8098A8E0 3C090600 */ lui $t1, %hi(D_06007440) ## $t1 = 06000000 -/* 01A64 8098A8E4 25297440 */ addiu $t1, $t1, %lo(D_06007440) ## $t1 = 06007440 -/* 01A68 8098A8E8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01A6C 8098A8EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01A70 8098A8F0 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 01A74 8098A8F4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01A78 8098A8F8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01A7C 8098A8FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 01A80 8098A900 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 01A84 8098A904 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 01A88 8098A908 8FAA0050 */ lw $t2, 0x0050($sp) -/* 01A8C 8098A90C 44067000 */ mfc1 $a2, $f14 -/* 01A90 8098A910 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01A94 8098A914 C5400168 */ lwc1 $f0, 0x0168($t2) ## 00000168 -/* 01A98 8098A918 0C034261 */ jal Matrix_Translate -/* 01A9C 8098A91C 46000300 */ add.s $f12, $f0, $f0 -/* 01AA0 8098A920 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01AA4 8098A924 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 01AA8 8098A928 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 01AAC 8098A92C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01AB0 8098A930 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 01AB4 8098A934 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01AB8 8098A938 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01ABC 8098A93C 3C058099 */ lui $a1, %hi(D_8098C974) ## $a1 = 80990000 -/* 01AC0 8098A940 24A5C974 */ addiu $a1, $a1, %lo(D_8098C974) ## $a1 = 8098C974 -/* 01AC4 8098A944 240605D9 */ addiu $a2, $zero, 0x05D9 ## $a2 = 000005D9 -/* 01AC8 8098A948 0C0346A2 */ jal Matrix_NewMtx -/* 01ACC 8098A94C AFA20028 */ sw $v0, 0x0028($sp) -/* 01AD0 8098A950 8FA30028 */ lw $v1, 0x0028($sp) -/* 01AD4 8098A954 3C0F0600 */ lui $t7, %hi(D_06007578) ## $t7 = 06000000 -/* 01AD8 8098A958 25EF7578 */ addiu $t7, $t7, %lo(D_06007578) ## $t7 = 06007578 -/* 01ADC 8098A95C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01AE0 8098A960 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01AE4 8098A964 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 01AE8 8098A968 3C068099 */ lui $a2, %hi(D_8098C988) ## $a2 = 80990000 -/* 01AEC 8098A96C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01AF0 8098A970 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 01AF4 8098A974 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01AF8 8098A978 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01AFC 8098A97C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01B00 8098A980 24C6C988 */ addiu $a2, $a2, %lo(D_8098C988) ## $a2 = 8098C988 -/* 01B04 8098A984 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01B08 8098A988 0C031AD5 */ jal Graph_CloseDisps -/* 01B0C 8098A98C 240705DD */ addiu $a3, $zero, 0x05DD ## $a3 = 000005DD -/* 01B10 8098A990 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B14 8098A994 8FB00014 */ lw $s0, 0x0014($sp) -/* 01B18 8098A998 8FB10018 */ lw $s1, 0x0018($sp) -/* 01B1C 8098A99C 03E00008 */ jr $ra -/* 01B20 8098A9A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s deleted file mode 100644 index b43dd87e4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s +++ /dev/null @@ -1,90 +0,0 @@ -.rdata -glabel D_8098C99C - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9B0 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9C4 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.text -glabel func_8098A9A4 -/* 01B24 8098A9A4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01B28 8098A9A8 AFB10020 */ sw $s1, 0x0020($sp) -/* 01B2C 8098A9AC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01B30 8098A9B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B34 8098A9B4 AFB0001C */ sw $s0, 0x001C($sp) -/* 01B38 8098A9B8 AFA40058 */ sw $a0, 0x0058($sp) -/* 01B3C 8098A9BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01B40 8098A9C0 3C068099 */ lui $a2, %hi(D_8098C99C) ## $a2 = 80990000 -/* 01B44 8098A9C4 24C6C99C */ addiu $a2, $a2, %lo(D_8098C99C) ## $a2 = 8098C99C -/* 01B48 8098A9C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 01B4C 8098A9CC 240705EA */ addiu $a3, $zero, 0x05EA ## $a3 = 000005EA -/* 01B50 8098A9D0 0C031AB1 */ jal Graph_OpenDisps -/* 01B54 8098A9D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01B58 8098A9D8 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C -/* 01B5C 8098A9DC 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) -/* 01B60 8098A9E0 11C00005 */ beq $t6, $zero, .L8098A9F8 -/* 01B64 8098A9E4 00000000 */ nop -/* 01B68 8098A9E8 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) -/* 01B6C 8098A9EC 29E10004 */ slti $at, $t7, 0x0004 -/* 01B70 8098A9F0 1420002A */ bne $at, $zero, .L8098AA9C -/* 01B74 8098A9F4 00000000 */ nop -.L8098A9F8: -/* 01B78 8098A9F8 0C024F61 */ jal func_80093D84 -/* 01B7C 8098A9FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01B80 8098AA00 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01B84 8098AA04 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 01B88 8098AA08 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 01B8C 8098AA0C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01B90 8098AA10 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 01B94 8098AA14 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01B98 8098AA18 8E26009C */ lw $a2, 0x009C($s1) ## 0000009C -/* 01B9C 8098AA1C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01BA0 8098AA20 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 01BA4 8098AA24 AFA80010 */ sw $t0, 0x0010($sp) -/* 01BA8 8098AA28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01BAC 8098AA2C 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 01BB0 8098AA30 AFA20038 */ sw $v0, 0x0038($sp) -/* 01BB4 8098AA34 0C0253A7 */ jal Gfx_TexScroll -/* 01BB8 8098AA38 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 01BBC 8098AA3C 8FA30038 */ lw $v1, 0x0038($sp) -/* 01BC0 8098AA40 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 01BC4 8098AA44 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 01BC8 8098AA48 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01BCC 8098AA4C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01BD0 8098AA50 3C058099 */ lui $a1, %hi(D_8098C9B0) ## $a1 = 80990000 -/* 01BD4 8098AA54 24A5C9B0 */ addiu $a1, $a1, %lo(D_8098C9B0) ## $a1 = 8098C9B0 -/* 01BD8 8098AA58 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01BDC 8098AA5C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 01BE0 8098AA60 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01BE4 8098AA64 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01BE8 8098AA68 240605F9 */ addiu $a2, $zero, 0x05F9 ## $a2 = 000005F9 -/* 01BEC 8098AA6C 0C0346A2 */ jal Matrix_NewMtx -/* 01BF0 8098AA70 AFA20034 */ sw $v0, 0x0034($sp) -/* 01BF4 8098AA74 8FA30034 */ lw $v1, 0x0034($sp) -/* 01BF8 8098AA78 3C0D0601 */ lui $t5, %hi(D_06008390) ## $t5 = 06010000 -/* 01BFC 8098AA7C 25AD8390 */ addiu $t5, $t5, %lo(D_06008390) ## $t5 = 06008390 -/* 01C00 8098AA80 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01C04 8098AA84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01C08 8098AA88 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 01C0C 8098AA8C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01C10 8098AA90 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 01C14 8098AA94 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01C18 8098AA98 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L8098AA9C: -/* 01C1C 8098AA9C 3C068099 */ lui $a2, %hi(D_8098C9C4) ## $a2 = 80990000 -/* 01C20 8098AAA0 24C6C9C4 */ addiu $a2, $a2, %lo(D_8098C9C4) ## $a2 = 8098C9C4 -/* 01C24 8098AAA4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 01C28 8098AAA8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01C2C 8098AAAC 0C031AD5 */ jal Graph_CloseDisps -/* 01C30 8098AAB0 240705FE */ addiu $a3, $zero, 0x05FE ## $a3 = 000005FE -/* 01C34 8098AAB4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C38 8098AAB8 8FB0001C */ lw $s0, 0x001C($sp) -/* 01C3C 8098AABC 8FB10020 */ lw $s1, 0x0020($sp) -/* 01C40 8098AAC0 03E00008 */ jr $ra -/* 01C44 8098AAC4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s deleted file mode 100644 index 9fb1fd618c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_8098AAC8 -/* 01C48 8098AAC8 C4840000 */ lwc1 $f4, 0x0000($a0) ## 00000000 -/* 01C4C 8098AACC E4A40000 */ swc1 $f4, 0x0000($a1) ## 00000000 -/* 01C50 8098AAD0 C4860004 */ lwc1 $f6, 0x0004($a0) ## 00000004 -/* 01C54 8098AAD4 E4A60004 */ swc1 $f6, 0x0004($a1) ## 00000004 -/* 01C58 8098AAD8 C4880008 */ lwc1 $f8, 0x0008($a0) ## 00000008 -/* 01C5C 8098AADC 03E00008 */ jr $ra -/* 01C60 8098AAE0 E4A80008 */ swc1 $f8, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s deleted file mode 100644 index c47be599f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098AAE4 -/* 01C64 8098AAE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01C68 8098AAE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C6C 8098AAEC AFA40030 */ sw $a0, 0x0030($sp) -/* 01C70 8098AAF0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01C74 8098AAF4 AFA70034 */ sw $a3, 0x0034($sp) -/* 01C78 8098AAF8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01C7C 8098AAFC 0C01F097 */ jal OLib_VecSphGeoToVec3f -/* 01C80 8098AB00 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFE8 -/* 01C84 8098AB04 8FA70034 */ lw $a3, 0x0034($sp) -/* 01C88 8098AB08 C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 01C8C 8098AB0C C7B0001C */ lwc1 $f16, 0x001C($sp) -/* 01C90 8098AB10 C4E40000 */ lwc1 $f4, 0x0000($a3) ## 00000000 -/* 01C94 8098AB14 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 -/* 01C98 8098AB18 8FA20030 */ lw $v0, 0x0030($sp) -/* 01C9C 8098AB1C 46062200 */ add.s $f8, $f4, $f6 -/* 01CA0 8098AB20 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 01CA4 8098AB24 E7A80024 */ swc1 $f8, 0x0024($sp) -/* 01CA8 8098AB28 C4EA0004 */ lwc1 $f10, 0x0004($a3) ## 00000004 -/* 01CAC 8098AB2C 46105480 */ add.s $f18, $f10, $f16 -/* 01CB0 8098AB30 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 01CB4 8098AB34 C4E40008 */ lwc1 $f4, 0x0008($a3) ## 00000008 -/* 01CB8 8098AB38 46062200 */ add.s $f8, $f4, $f6 -/* 01CBC 8098AB3C E7A8002C */ swc1 $f8, 0x002C($sp) -/* 01CC0 8098AB40 8DD80000 */ lw $t8, 0x0000($t6) ## FFFFFFF4 -/* 01CC4 8098AB44 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01CC8 8098AB48 8DCF0004 */ lw $t7, 0x0004($t6) ## FFFFFFF8 -/* 01CCC 8098AB4C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01CD0 8098AB50 8DD80008 */ lw $t8, 0x0008($t6) ## FFFFFFFC -/* 01CD4 8098AB54 AC580008 */ sw $t8, 0x0008($v0) ## 00000008 -/* 01CD8 8098AB58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CDC 8098AB5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01CE0 8098AB60 03E00008 */ jr $ra -/* 01CE4 8098AB64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s deleted file mode 100644 index faee821161..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8098AB68 -/* 01CE8 8098AB68 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01CEC 8098AB6C AFA40030 */ sw $a0, 0x0030($sp) -/* 01CF0 8098AB70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CF4 8098AB74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01CF8 8098AB78 AFA60038 */ sw $a2, 0x0038($sp) -/* 01CFC 8098AB7C 0C262AB2 */ jal func_8098AAC8 -/* 01D00 8098AB80 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFEC -/* 01D04 8098AB84 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF8 -/* 01D08 8098AB88 0C01F0FD */ jal OLib_Vec3fToVecSphGeo -/* 01D0C 8098AB8C 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFEC -/* 01D10 8098AB90 8FA50030 */ lw $a1, 0x0030($sp) -/* 01D14 8098AB94 87AE002E */ lh $t6, 0x002E($sp) -/* 01D18 8098AB98 8FA40038 */ lw $a0, 0x0038($sp) -/* 01D1C 8098AB9C 84AF000E */ lh $t7, 0x000E($a1) ## 0000000E -/* 01D20 8098ABA0 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFF8 -/* 01D24 8098ABA4 01CFC021 */ addu $t8, $t6, $t7 -/* 01D28 8098ABA8 0C262AB9 */ jal func_8098AAE4 -/* 01D2C 8098ABAC A7B8002E */ sh $t8, 0x002E($sp) -/* 01D30 8098ABB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D34 8098ABB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01D38 8098ABB8 03E00008 */ jr $ra -/* 01D3C 8098ABBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s deleted file mode 100644 index 3183378e51..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ /dev/null @@ -1,547 +0,0 @@ -.rdata -glabel D_8098C9D8 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9EC - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA00 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB44 - .float 0.2 - -glabel D_8098CB48 - .float 0.2 - -glabel D_8098CB4C - .word 0x3C9374BC -glabel D_8098CB50 - .word 0x3C8EFA35 - -.text -glabel func_8098ABC0 -/* 01D40 8098ABC0 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 -/* 01D44 8098ABC4 AFBF006C */ sw $ra, 0x006C($sp) -/* 01D48 8098ABC8 AFB60068 */ sw $s6, 0x0068($sp) -/* 01D4C 8098ABCC AFB50064 */ sw $s5, 0x0064($sp) -/* 01D50 8098ABD0 AFB40060 */ sw $s4, 0x0060($sp) -/* 01D54 8098ABD4 AFB3005C */ sw $s3, 0x005C($sp) -/* 01D58 8098ABD8 AFB20058 */ sw $s2, 0x0058($sp) -/* 01D5C 8098ABDC AFB10054 */ sw $s1, 0x0054($sp) -/* 01D60 8098ABE0 AFB00050 */ sw $s0, 0x0050($sp) -/* 01D64 8098ABE4 F7BE0048 */ sdc1 $f30, 0x0048($sp) -/* 01D68 8098ABE8 F7BC0040 */ sdc1 $f28, 0x0040($sp) -/* 01D6C 8098ABEC F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 01D70 8098ABF0 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 01D74 8098ABF4 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 01D78 8098ABF8 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 01D7C 8098ABFC 3C0F8016 */ lui $t7, %hi(gSaveContext+4) -/* 01D80 8098AC00 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01D84 8098AC04 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) -/* 01D88 8098AC08 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01D8C 8098AC0C AFAE00E4 */ sw $t6, 0x00E4($sp) -/* 01D90 8098AC10 A3AF00B7 */ sb $t7, 0x00B7($sp) -/* 01D94 8098AC14 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01D98 8098AC18 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01D9C 8098AC1C 3C068099 */ lui $a2, %hi(D_8098C9D8) ## $a2 = 80990000 -/* 01DA0 8098AC20 24C6C9D8 */ addiu $a2, $a2, %lo(D_8098C9D8) ## $a2 = 8098C9D8 -/* 01DA4 8098AC24 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 -/* 01DA8 8098AC28 24070720 */ addiu $a3, $zero, 0x0720 ## $a3 = 00000720 -/* 01DAC 8098AC2C 0C031AB1 */ jal Graph_OpenDisps -/* 01DB0 8098AC30 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 01DB4 8098AC34 9222014D */ lbu $v0, 0x014D($s1) ## 0000014D -/* 01DB8 8098AC38 27B600D8 */ addiu $s6, $sp, 0x00D8 ## $s6 = FFFFFFE0 -/* 01DBC 8098AC3C 2841001E */ slti $at, $v0, 0x001E -/* 01DC0 8098AC40 10200003 */ beq $at, $zero, .L8098AC50 -/* 01DC4 8098AC44 24580002 */ addiu $t8, $v0, 0x0002 ## $t8 = 00000002 -/* 01DC8 8098AC48 A238014D */ sb $t8, 0x014D($s1) ## 0000014D -/* 01DCC 8098AC4C 330200FF */ andi $v0, $t8, 0x00FF ## $v0 = 00000002 -.L8098AC50: -/* 01DD0 8098AC50 2454FFFF */ addiu $s4, $v0, 0xFFFF ## $s4 = 00000001 -/* 01DD4 8098AC54 0014A400 */ sll $s4, $s4, 16 -/* 01DD8 8098AC58 0014A403 */ sra $s4, $s4, 16 -/* 01DDC 8098AC5C 068001A7 */ bltz $s4, .L8098B2FC -/* 01DE0 8098AC60 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DE4 8098AC64 4481E000 */ mtc1 $at, $f28 ## $f28 = 1.00 -/* 01DE8 8098AC68 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 01DEC 8098AC6C 4481D000 */ mtc1 $at, $f26 ## $f26 = 16.00 -/* 01DF0 8098AC70 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01DF4 8098AC74 4481C000 */ mtc1 $at, $f24 ## $f24 = 0.50 -/* 01DF8 8098AC78 4480F000 */ mtc1 $zero, $f30 ## $f30 = 0.00 -/* 01DFC 8098AC7C 2415000F */ addiu $s5, $zero, 0x000F ## $s5 = 0000000F -/* 01E00 8098AC80 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098AC84: -/* 01E04 8098AC84 44942000 */ mtc1 $s4, $f4 ## $f4 = 0.00 -/* 01E08 8098AC88 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01E0C 8098AC8C 44834000 */ mtc1 $v1, $f8 ## $f8 = 0.00 -/* 01E10 8098AC90 468021A0 */ cvt.s.w $f6, $f4 -/* 01E14 8098AC94 04610004 */ bgez $v1, .L8098ACA8 -/* 01E18 8098AC98 468042A0 */ cvt.s.w $f10, $f8 -/* 01E1C 8098AC9C 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 01E20 8098ACA0 00000000 */ nop -/* 01E24 8098ACA4 46105280 */ add.s $f10, $f10, $f16 -.L8098ACA8: -/* 01E28 8098ACA8 460A3483 */ div.s $f18, $f6, $f10 -/* 01E2C 8098ACAC 0014C880 */ sll $t9, $s4, 2 -/* 01E30 8098ACB0 0334C821 */ addu $t9, $t9, $s4 -/* 01E34 8098ACB4 0019C8C0 */ sll $t9, $t9, 3 -/* 01E38 8098ACB8 02398021 */ addu $s0, $s1, $t9 -/* 01E3C 8098ACBC 92020172 */ lbu $v0, 0x0172($s0) ## 00000172 -/* 01E40 8098ACC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01E44 8098ACC4 10400007 */ beq $v0, $zero, .L8098ACE4 -/* 01E48 8098ACC8 4612E581 */ sub.s $f22, $f28, $f18 -/* 01E4C 8098ACCC 10410035 */ beq $v0, $at, .L8098ADA4 -/* 01E50 8098ACD0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E54 8098ACD4 50410084 */ beql $v0, $at, .L8098AEE8 -/* 01E58 8098ACD8 862B001C */ lh $t3, 0x001C($s1) ## 0000001C -/* 01E5C 8098ACDC 10000096 */ beq $zero, $zero, .L8098AF38 -/* 01E60 8098ACE0 00000000 */ nop -.L8098ACE4: -/* 01E64 8098ACE4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01E68 8098ACE8 A6000170 */ sh $zero, 0x0170($s0) ## 00000170 -/* 01E6C 8098ACEC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01E70 8098ACF0 E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 01E74 8098ACF4 46180201 */ sub.s $f8, $f0, $f24 -/* 01E78 8098ACF8 461A4402 */ mul.s $f16, $f8, $f26 -/* 01E7C 8098ACFC 00000000 */ nop -/* 01E80 8098AD00 46168182 */ mul.s $f6, $f16, $f22 -/* 01E84 8098AD04 4600328D */ trunc.w.s $f10, $f6 -/* 01E88 8098AD08 44095000 */ mfc1 $t1, $f10 -/* 01E8C 8098AD0C 00000000 */ nop -/* 01E90 8098AD10 00095400 */ sll $t2, $t1, 16 -/* 01E94 8098AD14 000A5C03 */ sra $t3, $t2, 16 -/* 01E98 8098AD18 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 01E9C 8098AD1C 00000000 */ nop -/* 01EA0 8098AD20 46809120 */ cvt.s.w $f4, $f18 -/* 01EA4 8098AD24 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01EA8 8098AD28 E6040150 */ swc1 $f4, 0x0150($s0) ## 00000150 -/* 01EAC 8098AD2C 46180201 */ sub.s $f8, $f0, $f24 -/* 01EB0 8098AD30 461A4402 */ mul.s $f16, $f8, $f26 -/* 01EB4 8098AD34 00000000 */ nop -/* 01EB8 8098AD38 46168182 */ mul.s $f6, $f16, $f22 -/* 01EBC 8098AD3C 4600328D */ trunc.w.s $f10, $f6 -/* 01EC0 8098AD40 440D5000 */ mfc1 $t5, $f10 -/* 01EC4 8098AD44 00000000 */ nop -/* 01EC8 8098AD48 000D7400 */ sll $t6, $t5, 16 -/* 01ECC 8098AD4C 000E7C03 */ sra $t7, $t6, 16 -/* 01ED0 8098AD50 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01ED4 8098AD54 00000000 */ nop -/* 01ED8 8098AD58 46809120 */ cvt.s.w $f4, $f18 -/* 01EDC 8098AD5C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01EE0 8098AD60 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -/* 01EE4 8098AD64 46180201 */ sub.s $f8, $f0, $f24 -/* 01EE8 8098AD68 920A0172 */ lbu $t2, 0x0172($s0) ## 00000172 -/* 01EEC 8098AD6C A2000173 */ sb $zero, 0x0173($s0) ## 00000173 -/* 01EF0 8098AD70 461A4402 */ mul.s $f16, $f8, $f26 -/* 01EF4 8098AD74 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 01EF8 8098AD78 A20B0172 */ sb $t3, 0x0172($s0) ## 00000172 -/* 01EFC 8098AD7C 46168182 */ mul.s $f6, $f16, $f22 -/* 01F00 8098AD80 4600328D */ trunc.w.s $f10, $f6 -/* 01F04 8098AD84 44195000 */ mfc1 $t9, $f10 -/* 01F08 8098AD88 00000000 */ nop -/* 01F0C 8098AD8C 00194400 */ sll $t0, $t9, 16 -/* 01F10 8098AD90 00084C03 */ sra $t1, $t0, 16 -/* 01F14 8098AD94 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 01F18 8098AD98 00000000 */ nop -/* 01F1C 8098AD9C 46809120 */ cvt.s.w $f4, $f18 -/* 01F20 8098ADA0 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L8098ADA4: -/* 01F24 8098ADA4 862C001C */ lh $t4, 0x001C($s1) ## 0000001C -/* 01F28 8098ADA8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01F2C 8098ADAC 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01F30 8098ADB0 16AC001E */ bne $s5, $t4, .L8098AE2C -/* 01F34 8098ADB4 240420A7 */ addiu $a0, $zero, 0x20A7 ## $a0 = 000020A7 -/* 01F38 8098ADB8 3C058099 */ lui $a1, %hi(D_8098CF88) ## $a1 = 80990000 -/* 01F3C 8098ADBC 3C068099 */ lui $a2, %hi(D_8098CF8C) ## $a2 = 80990000 -/* 01F40 8098ADC0 3C078099 */ lui $a3, %hi(D_8098C330) ## $a3 = 80990000 -/* 01F44 8098ADC4 260D0170 */ addiu $t5, $s0, 0x0170 ## $t5 = 00000170 -/* 01F48 8098ADC8 260E016C */ addiu $t6, $s0, 0x016C ## $t6 = 0000016C -/* 01F4C 8098ADCC AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F50 8098ADD0 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01F54 8098ADD4 24E7C330 */ addiu $a3, $a3, %lo(D_8098C330) ## $a3 = 8098C330 -/* 01F58 8098ADD8 24C6CF8C */ addiu $a2, $a2, %lo(D_8098CF8C) ## $a2 = 8098CF8C -/* 01F5C 8098ADDC 24A5CF88 */ addiu $a1, $a1, %lo(D_8098CF88) ## $a1 = 8098CF88 -/* 01F60 8098ADE0 0C02ECAD */ jal func_800BB2B4 -/* 01F64 8098ADE4 02C02025 */ or $a0, $s6, $zero ## $a0 = FFFFFFE0 -/* 01F68 8098ADE8 50400005 */ beql $v0, $zero, .L8098AE00 -/* 01F6C 8098ADEC 865900A4 */ lh $t9, 0x00A4($s2) ## 000000A4 -/* 01F70 8098ADF0 920F0172 */ lbu $t7, 0x0172($s0) ## 00000172 -/* 01F74 8098ADF4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 01F78 8098ADF8 A2180172 */ sb $t8, 0x0172($s0) ## 00000172 -/* 01F7C 8098ADFC 865900A4 */ lh $t9, 0x00A4($s2) ## 000000A4 -.L8098AE00: -/* 01F80 8098AE00 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 01F84 8098AE04 5721002E */ bnel $t9, $at, .L8098AEC0 -/* 01F88 8098AE08 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 01F8C 8098AE0C 96481D74 */ lhu $t0, 0x1D74($s2) ## 00001D74 -/* 01F90 8098AE10 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 01F94 8098AE14 5501002A */ bnel $t0, $at, .L8098AEC0 -/* 01F98 8098AE18 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 01F9C 8098AE1C 92090172 */ lbu $t1, 0x0172($s0) ## 00000172 -/* 01FA0 8098AE20 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01FA4 8098AE24 10000025 */ beq $zero, $zero, .L8098AEBC -/* 01FA8 8098AE28 A20A0172 */ sb $t2, 0x0172($s0) ## 00000172 -.L8098AE2C: -/* 01FAC 8098AE2C 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 01FB0 8098AE30 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 01FB4 8098AE34 3C058013 */ lui $a1, %hi(D_801333D4) -/* 01FB8 8098AE38 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 01FBC 8098AE3C AFAB0014 */ sw $t3, 0x0014($sp) -/* 01FC0 8098AE40 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01FC4 8098AE44 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01FC8 8098AE48 AFA70010 */ sw $a3, 0x0010($sp) -/* 01FCC 8098AE4C 3C058099 */ lui $a1, %hi(D_8098CF88) ## $a1 = 80990000 -/* 01FD0 8098AE50 3C068099 */ lui $a2, %hi(D_8098CF8C) ## $a2 = 80990000 -/* 01FD4 8098AE54 3C078099 */ lui $a3, %hi(D_8098C410) ## $a3 = 80990000 -/* 01FD8 8098AE58 260C0170 */ addiu $t4, $s0, 0x0170 ## $t4 = 00000170 -/* 01FDC 8098AE5C 260D016C */ addiu $t5, $s0, 0x016C ## $t5 = 0000016C -/* 01FE0 8098AE60 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01FE4 8098AE64 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01FE8 8098AE68 24E7C410 */ addiu $a3, $a3, %lo(D_8098C410) ## $a3 = 8098C410 -/* 01FEC 8098AE6C 24C6CF8C */ addiu $a2, $a2, %lo(D_8098CF8C) ## $a2 = 8098CF8C -/* 01FF0 8098AE70 24A5CF88 */ addiu $a1, $a1, %lo(D_8098CF88) ## $a1 = 8098CF88 -/* 01FF4 8098AE74 0C02ECAD */ jal func_800BB2B4 -/* 01FF8 8098AE78 02C02025 */ or $a0, $s6, $zero ## $a0 = FFFFFFE0 -/* 01FFC 8098AE7C 10400004 */ beq $v0, $zero, .L8098AE90 -/* 02000 8098AE80 3C188099 */ lui $t8, %hi(D_8098CF84) ## $t8 = 80990000 -/* 02004 8098AE84 920E0172 */ lbu $t6, 0x0172($s0) ## 00000172 -/* 02008 8098AE88 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0200C 8098AE8C A20F0172 */ sb $t7, 0x0172($s0) ## 00000172 -.L8098AE90: -/* 02010 8098AE90 8718CF84 */ lh $t8, %lo(D_8098CF84)($t8) -/* 02014 8098AE94 96591D74 */ lhu $t9, 0x1D74($s2) ## 00001D74 -/* 02018 8098AE98 0319082A */ slt $at, $t8, $t9 -/* 0201C 8098AE9C 50200008 */ beql $at, $zero, .L8098AEC0 -/* 02020 8098AEA0 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 02024 8098AEA4 8628001C */ lh $t0, 0x001C($s1) ## 0000001C -/* 02028 8098AEA8 56A80005 */ bnel $s5, $t0, .L8098AEC0 -/* 0202C 8098AEAC 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 02030 8098AEB0 92090172 */ lbu $t1, 0x0172($s0) ## 00000172 -/* 02034 8098AEB4 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 02038 8098AEB8 A20A0172 */ sb $t2, 0x0172($s0) ## 00000172 -.L8098AEBC: -/* 0203C 8098AEBC 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -.L8098AEC0: -/* 02040 8098AEC0 0C00BBC5 */ jal Actor_GetWorld -/* 02044 8098AEC4 8FA500E4 */ lw $a1, 0x00E4($sp) -/* 02048 8098AEC8 3C068099 */ lui $a2, %hi(D_8098CF98) ## $a2 = 80990000 -/* 0204C 8098AECC 24C6CF98 */ addiu $a2, $a2, %lo(D_8098CF98) ## $a2 = 8098CF98 -/* 02050 8098AED0 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 02054 8098AED4 0C262ADA */ jal func_8098AB68 -/* 02058 8098AED8 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFE0 -/* 0205C 8098AEDC 10000016 */ beq $zero, $zero, .L8098AF38 -/* 02060 8098AEE0 00000000 */ nop -/* 02064 8098AEE4 862B001C */ lh $t3, 0x001C($s1) ## 0000001C -.L8098AEE8: -/* 02068 8098AEE8 268E0001 */ addiu $t6, $s4, 0x0001 ## $t6 = 00000002 -/* 0206C 8098AEEC 16AB0009 */ bne $s5, $t3, .L8098AF14 -/* 02070 8098AEF0 00000000 */ nop -/* 02074 8098AEF4 16800010 */ bne $s4, $zero, .L8098AF38 -/* 02078 8098AEF8 00000000 */ nop -/* 0207C 8098AEFC 0C01DDB9 */ jal func_800776E4 -/* 02080 8098AF00 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02084 8098AF04 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 02088 8098AF08 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 0208C 8098AF0C 1000000A */ beq $zero, $zero, .L8098AF38 -/* 02090 8098AF10 A20D0172 */ sb $t5, 0x0172($s0) ## 00000172 -.L8098AF14: -/* 02094 8098AF14 15C30008 */ bne $t6, $v1, .L8098AF38 -/* 02098 8098AF18 00000000 */ nop -/* 0209C 8098AF1C 924F1D6C */ lbu $t7, 0x1D6C($s2) ## 00001D6C -/* 020A0 8098AF20 15E00005 */ bne $t7, $zero, .L8098AF38 -/* 020A4 8098AF24 00000000 */ nop -/* 020A8 8098AF28 0C0222BC */ jal func_80088AF0 -/* 020AC 8098AF2C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 020B0 8098AF30 0C00B55C */ jal Actor_Kill - -/* 020B4 8098AF34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8098AF38: -/* 020B8 8098AF38 3C018099 */ lui $at, %hi(D_8098CF98) ## $at = 80990000 -/* 020BC 8098AF3C C428CF98 */ lwc1 $f8, %lo(D_8098CF98)($at) -/* 020C0 8098AF40 92020173 */ lbu $v0, 0x0173($s0) ## 00000173 -/* 020C4 8098AF44 E608015C */ swc1 $f8, 0x015C($s0) ## 0000015C -/* 020C8 8098AF48 C430CF9C */ lwc1 $f16, %lo(D_8098CF9C)($at) -/* 020CC 8098AF4C 3C018099 */ lui $at, %hi(D_8098CFA0) ## $at = 80990000 -/* 020D0 8098AF50 E6100160 */ swc1 $f16, 0x0160($s0) ## 00000160 -/* 020D4 8098AF54 C426CFA0 */ lwc1 $f6, %lo(D_8098CFA0)($at) -/* 020D8 8098AF58 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 020DC 8098AF5C 10400007 */ beq $v0, $zero, .L8098AF7C -/* 020E0 8098AF60 E6060164 */ swc1 $f6, 0x0164($s0) ## 00000164 -/* 020E4 8098AF64 1041000B */ beq $v0, $at, .L8098AF94 -/* 020E8 8098AF68 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 020EC 8098AF6C 1041001A */ beq $v0, $at, .L8098AFD8 -/* 020F0 8098AF70 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 020F4 8098AF74 10000054 */ beq $zero, $zero, .L8098B0C8 -/* 020F8 8098AF78 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098AF7C: -/* 020FC 8098AF7C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02100 8098AF80 00000000 */ nop -/* 02104 8098AF84 92180173 */ lbu $t8, 0x0173($s0) ## 00000173 -/* 02108 8098AF88 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0210C 8098AF8C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 02110 8098AF90 A2190173 */ sb $t9, 0x0173($s0) ## 00000173 -.L8098AF94: -/* 02114 8098AF94 3C018099 */ lui $at, %hi(D_8098CB44) ## $at = 80990000 -/* 02118 8098AF98 C42ACB44 */ lwc1 $f10, %lo(D_8098CB44)($at) -/* 0211C 8098AF9C 4405E000 */ mfc1 $a1, $f28 -/* 02120 8098AFA0 4406C000 */ mfc1 $a2, $f24 -/* 02124 8098AFA4 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 -/* 02128 8098AFA8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD -/* 0212C 8098AFAC 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 02130 8098AFB0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02134 8098AFB4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02138 8098AFB8 C6120168 */ lwc1 $f18, 0x0168($s0) ## 00000168 -/* 0213C 8098AFBC 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02140 8098AFC0 4612E03E */ c.le.s $f28, $f18 -/* 02144 8098AFC4 00000000 */ nop -/* 02148 8098AFC8 4502003F */ bc1fl .L8098B0C8 -/* 0214C 8098AFCC 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 02150 8098AFD0 1000003C */ beq $zero, $zero, .L8098B0C4 -/* 02154 8098AFD4 A2080173 */ sb $t0, 0x0173($s0) ## 00000173 -.L8098AFD8: -/* 02158 8098AFD8 3C018099 */ lui $at, %hi(D_8098CB48) ## $at = 80990000 -/* 0215C 8098AFDC C424CB48 */ lwc1 $f4, %lo(D_8098CB48)($at) -/* 02160 8098AFE0 4405F000 */ mfc1 $a1, $f30 -/* 02164 8098AFE4 4406C000 */ mfc1 $a2, $f24 -/* 02168 8098AFE8 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 -/* 0216C 8098AFEC 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 02170 8098AFF0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02174 8098AFF4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02178 8098AFF8 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 -/* 0217C 8098AFFC 461E403E */ c.le.s $f8, $f30 -/* 02180 8098B000 00000000 */ nop -/* 02184 8098B004 45020030 */ bc1fl .L8098B0C8 -/* 02188 8098B008 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 0218C 8098B00C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02190 8098B010 00000000 */ nop -/* 02194 8098B014 46180401 */ sub.s $f16, $f0, $f24 -/* 02198 8098B018 461A8182 */ mul.s $f6, $f16, $f26 -/* 0219C 8098B01C 00000000 */ nop -/* 021A0 8098B020 46163282 */ mul.s $f10, $f6, $f22 -/* 021A4 8098B024 4600548D */ trunc.w.s $f18, $f10 -/* 021A8 8098B028 440A9000 */ mfc1 $t2, $f18 -/* 021AC 8098B02C 00000000 */ nop -/* 021B0 8098B030 000A5C00 */ sll $t3, $t2, 16 -/* 021B4 8098B034 000B6403 */ sra $t4, $t3, 16 -/* 021B8 8098B038 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 021BC 8098B03C 00000000 */ nop -/* 021C0 8098B040 46802220 */ cvt.s.w $f8, $f4 -/* 021C4 8098B044 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 021C8 8098B048 E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 -/* 021CC 8098B04C 46180401 */ sub.s $f16, $f0, $f24 -/* 021D0 8098B050 461A8182 */ mul.s $f6, $f16, $f26 -/* 021D4 8098B054 00000000 */ nop -/* 021D8 8098B058 46163282 */ mul.s $f10, $f6, $f22 -/* 021DC 8098B05C 4600548D */ trunc.w.s $f18, $f10 -/* 021E0 8098B060 440E9000 */ mfc1 $t6, $f18 -/* 021E4 8098B064 00000000 */ nop -/* 021E8 8098B068 000E7C00 */ sll $t7, $t6, 16 -/* 021EC 8098B06C 000FC403 */ sra $t8, $t7, 16 -/* 021F0 8098B070 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 021F4 8098B074 00000000 */ nop -/* 021F8 8098B078 46802220 */ cvt.s.w $f8, $f4 -/* 021FC 8098B07C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02200 8098B080 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -/* 02204 8098B084 46180401 */ sub.s $f16, $f0, $f24 -/* 02208 8098B088 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0220C 8098B08C E61E0168 */ swc1 $f30, 0x0168($s0) ## 00000168 -/* 02210 8098B090 A20B0173 */ sb $t3, 0x0173($s0) ## 00000173 -/* 02214 8098B094 461A8182 */ mul.s $f6, $f16, $f26 -/* 02218 8098B098 00000000 */ nop -/* 0221C 8098B09C 46163282 */ mul.s $f10, $f6, $f22 -/* 02220 8098B0A0 4600548D */ trunc.w.s $f18, $f10 -/* 02224 8098B0A4 44089000 */ mfc1 $t0, $f18 -/* 02228 8098B0A8 00000000 */ nop -/* 0222C 8098B0AC 00084C00 */ sll $t1, $t0, 16 -/* 02230 8098B0B0 00095403 */ sra $t2, $t1, 16 -/* 02234 8098B0B4 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 02238 8098B0B8 00000000 */ nop -/* 0223C 8098B0BC 46802220 */ cvt.s.w $f8, $f4 -/* 02240 8098B0C0 E6080158 */ swc1 $f8, 0x0158($s0) ## 00000158 -.L8098B0C4: -/* 02244 8098B0C4 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098B0C8: -/* 02248 8098B0C8 C6120150 */ lwc1 $f18, 0x0150($s0) ## 00000150 -/* 0224C 8098B0CC C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 02250 8098B0D0 C60E0154 */ lwc1 $f14, 0x0154($s0) ## 00000154 -/* 02254 8098B0D4 C60A0160 */ lwc1 $f10, 0x0160($s0) ## 00000160 -/* 02258 8098B0D8 46109300 */ add.s $f12, $f18, $f16 -/* 0225C 8098B0DC C6100158 */ lwc1 $f16, 0x0158($s0) ## 00000158 -/* 02260 8098B0E0 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 02264 8098B0E4 460A7500 */ add.s $f20, $f14, $f10 -/* 02268 8098B0E8 29810002 */ slti $at, $t4, 0x0002 -/* 0226C 8098B0EC 1020007E */ beq $at, $zero, .L8098B2E8 -/* 02270 8098B0F0 46128000 */ add.s $f0, $f16, $f18 -/* 02274 8098B0F4 93AF00B7 */ lbu $t7, 0x00B7($sp) -/* 02278 8098B0F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0227C 8098B0FC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(gEffFlash1DL) ## $t5 = 04010000 -/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(gEffFlash1DL) ## $t5 = 04010130 -/* 02288 8098B108 02417021 */ addu $t6, $s2, $at -/* 0228C 8098B10C AFAE0078 */ sw $t6, 0x0078($sp) -/* 02290 8098B110 11E00007 */ beq $t7, $zero, .L8098B130 -/* 02294 8098B114 AFAD0080 */ sw $t5, 0x0080($sp) -/* 02298 8098B118 44060000 */ mfc1 $a2, $f0 -/* 0229C 8098B11C 4600A386 */ mov.s $f14, $f20 -/* 022A0 8098B120 0C034261 */ jal Matrix_Translate -/* 022A4 8098B124 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 022A8 8098B128 10000007 */ beq $zero, $zero, .L8098B148 -/* 022AC 8098B12C 00000000 */ nop -.L8098B130: -/* 022B0 8098B130 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 022B4 8098B134 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 022B8 8098B138 44060000 */ mfc1 $a2, $f0 -/* 022BC 8098B13C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 022C0 8098B140 0C034261 */ jal Matrix_Translate -/* 022C4 8098B144 4610A380 */ add.s $f14, $f20, $f16 -.L8098B148: -/* 022C8 8098B148 3C018099 */ lui $at, %hi(D_8098CB4C) ## $at = 80990000 -/* 022CC 8098B14C C42ACB4C */ lwc1 $f10, %lo(D_8098CB4C)($at) -/* 022D0 8098B150 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -/* 022D4 8098B154 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 022D8 8098B158 46165482 */ mul.s $f18, $f10, $f22 -/* 022DC 8098B15C 00000000 */ nop -/* 022E0 8098B160 46123302 */ mul.s $f12, $f6, $f18 -/* 022E4 8098B164 44066000 */ mfc1 $a2, $f12 -/* 022E8 8098B168 0C0342A3 */ jal Matrix_Scale -/* 022EC 8098B16C 46006386 */ mov.s $f14, $f12 -/* 022F0 8098B170 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 022F4 8098B174 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 022F8 8098B178 37390080 */ ori $t9, $t9, 0x0080 ## $t9 = FA000080 -/* 022FC 8098B17C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02300 8098B180 AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 02304 8098B184 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 02308 8098B188 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 0230C 8098B18C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02310 8098B190 8629001C */ lh $t1, 0x001C($s1) ## 0000001C -/* 02314 8098B194 3C0A8099 */ lui $t2, %hi(D_8098C31C) ## $t2 = 80990000 -/* 02318 8098B198 3C058016 */ lui $a1, %hi(gSaveContext+0x1397) -/* 0231C 8098B19C 16A90019 */ bne $s5, $t1, .L8098B204 -/* 02320 8098B1A0 254AC31C */ addiu $t2, $t2, %lo(D_8098C31C) ## $t2 = 8098C31C -/* 02324 8098B1A4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02328 8098B1A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0232C 8098B1AC 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 02330 8098B1B0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02334 8098B1B4 AE6A02D0 */ sw $t2, 0x02D0($s3) ## 000002D0 -/* 02338 8098B1B8 02412821 */ addu $a1, $s2, $at -/* 0233C 8098B1BC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02340 8098B1C0 94AC04C4 */ lhu $t4, 0x04C4($a1) -/* 02344 8098B1C4 3C0E8099 */ lui $t6, %hi(D_8098C31C) ## $t6 = 80990000 -/* 02348 8098B1C8 25CEC31C */ addiu $t6, $t6, %lo(D_8098C31C) ## $t6 = 8098C31C -/* 0234C 8098B1CC 000C6880 */ sll $t5, $t4, 2 -/* 02350 8098B1D0 01AC6823 */ subu $t5, $t5, $t4 -/* 02354 8098B1D4 01AE1821 */ addu $v1, $t5, $t6 -/* 02358 8098B1D8 90780002 */ lbu $t8, 0x0002($v1) ## 00000002 -/* 0235C 8098B1DC 90690000 */ lbu $t1, 0x0000($v1) ## 00000000 -/* 02360 8098B1E0 906D0001 */ lbu $t5, 0x0001($v1) ## 00000001 -/* 02364 8098B1E4 0018CA00 */ sll $t9, $t8, 8 -/* 02368 8098B1E8 00095600 */ sll $t2, $t1, 24 -/* 0236C 8098B1EC 032A5825 */ or $t3, $t9, $t2 ## $t3 = FA000088 -/* 02370 8098B1F0 000D7400 */ sll $t6, $t5, 16 -/* 02374 8098B1F4 016E7825 */ or $t7, $t3, $t6 ## $t7 = FA98C39C -/* 02378 8098B1F8 35F800FF */ ori $t8, $t7, 0x00FF ## $t8 = FA98C3FF -/* 0237C 8098B1FC 10000014 */ beq $zero, $zero, .L8098B250 -/* 02380 8098B200 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -.L8098B204: -/* 02384 8098B204 80A5F9F7 */ lb $a1, %lo(gSaveContext+0x1397)($a1) -/* 02388 8098B208 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 0238C 8098B20C 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 02390 8098B210 0005C880 */ sll $t9, $a1, 2 -/* 02394 8098B214 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 02398 8098B218 AE6802D0 */ sw $t0, 0x02D0($s3) ## 000002D0 -/* 0239C 8098B21C 0325C823 */ subu $t9, $t9, $a1 -/* 023A0 8098B220 032A1821 */ addu $v1, $t9, $t2 -/* 023A4 8098B224 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 023A8 8098B228 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 -/* 023AC 8098B22C 906D0002 */ lbu $t5, 0x0002($v1) ## 00000002 -/* 023B0 8098B230 90790001 */ lbu $t9, 0x0001($v1) ## 00000001 -/* 023B4 8098B234 000FC600 */ sll $t8, $t7, 24 -/* 023B8 8098B238 000D5A00 */ sll $t3, $t5, 8 -/* 023BC 8098B23C 01784025 */ or $t0, $t3, $t8 ## $t0 = FA98C3FF -/* 023C0 8098B240 00195400 */ sll $t2, $t9, 16 -/* 023C4 8098B244 010A6025 */ or $t4, $t0, $t2 ## $t4 = FA98C3FF -/* 023C8 8098B248 358D00FF */ ori $t5, $t4, 0x00FF ## $t5 = FA98C3FF -/* 023CC 8098B24C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L8098B250: -/* 023D0 8098B250 0C024F61 */ jal func_80093D84 -/* 023D4 8098B254 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 023D8 8098B258 8FA40078 */ lw $a0, 0x0078($sp) -/* 023DC 8098B25C 0C03424C */ jal Matrix_Mult -/* 023E0 8098B260 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 023E4 8098B264 860E0174 */ lh $t6, 0x0174($s0) ## 00000174 -/* 023E8 8098B268 3C018099 */ lui $at, %hi(D_8098CB50) ## $at = 80990000 -/* 023EC 8098B26C C430CB50 */ lwc1 $f16, %lo(D_8098CB50)($at) -/* 023F0 8098B270 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 023F4 8098B274 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 023F8 8098B278 46802220 */ cvt.s.w $f8, $f4 -/* 023FC 8098B27C 46104302 */ mul.s $f12, $f8, $f16 -/* 02400 8098B280 0C0343B5 */ jal Matrix_RotateZ -/* 02404 8098B284 00000000 */ nop -/* 02408 8098B288 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 0240C 8098B28C 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 02410 8098B290 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 02414 8098B294 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02418 8098B298 AE6F02D0 */ sw $t7, 0x02D0($s3) ## 000002D0 -/* 0241C 8098B29C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02420 8098B2A0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02424 8098B2A4 3C058099 */ lui $a1, %hi(D_8098C9EC) ## $a1 = 80990000 -/* 02428 8098B2A8 24A5C9EC */ addiu $a1, $a1, %lo(D_8098C9EC) ## $a1 = 8098C9EC -/* 0242C 8098B2AC 240607DB */ addiu $a2, $zero, 0x07DB ## $a2 = 000007DB -/* 02430 8098B2B0 0C0346A2 */ jal Matrix_NewMtx -/* 02434 8098B2B4 AFA2008C */ sw $v0, 0x008C($sp) -/* 02438 8098B2B8 8FA3008C */ lw $v1, 0x008C($sp) -/* 0243C 8098B2BC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 02440 8098B2C0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02444 8098B2C4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02448 8098B2C8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0244C 8098B2CC AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 02450 8098B2D0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02454 8098B2D4 8FB90080 */ lw $t9, 0x0080($sp) -/* 02458 8098B2D8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0245C 8098B2DC 86080174 */ lh $t0, 0x0174($s0) ## 00000174 -/* 02460 8098B2E0 250A0190 */ addiu $t2, $t0, 0x0190 ## $t2 = 00000190 -/* 02464 8098B2E4 A60A0174 */ sh $t2, 0x0174($s0) ## 00000174 -.L8098B2E8: -/* 02468 8098B2E8 2694FFFF */ addiu $s4, $s4, 0xFFFF ## $s4 = 00000000 -/* 0246C 8098B2EC 0014A400 */ sll $s4, $s4, 16 -/* 02470 8098B2F0 0014A403 */ sra $s4, $s4, 16 -/* 02474 8098B2F4 0683FE63 */ bgezl $s4, .L8098AC84 -/* 02478 8098B2F8 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098B2FC: -/* 0247C 8098B2FC 3C068099 */ lui $a2, %hi(D_8098CA00) ## $a2 = 80990000 -/* 02480 8098B300 24C6CA00 */ addiu $a2, $a2, %lo(D_8098CA00) ## $a2 = 8098CA00 -/* 02484 8098B304 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 -/* 02488 8098B308 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0248C 8098B30C 0C031AD5 */ jal Graph_CloseDisps -/* 02490 8098B310 240707E3 */ addiu $a3, $zero, 0x07E3 ## $a3 = 000007E3 -/* 02494 8098B314 8FBF006C */ lw $ra, 0x006C($sp) -/* 02498 8098B318 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 0249C 8098B31C D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 024A0 8098B320 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 024A4 8098B324 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 024A8 8098B328 D7BC0040 */ ldc1 $f28, 0x0040($sp) -/* 024AC 8098B32C D7BE0048 */ ldc1 $f30, 0x0048($sp) -/* 024B0 8098B330 8FB00050 */ lw $s0, 0x0050($sp) -/* 024B4 8098B334 8FB10054 */ lw $s1, 0x0054($sp) -/* 024B8 8098B338 8FB20058 */ lw $s2, 0x0058($sp) -/* 024BC 8098B33C 8FB3005C */ lw $s3, 0x005C($sp) -/* 024C0 8098B340 8FB40060 */ lw $s4, 0x0060($sp) -/* 024C4 8098B344 8FB50064 */ lw $s5, 0x0064($sp) -/* 024C8 8098B348 8FB60068 */ lw $s6, 0x0068($sp) -/* 024CC 8098B34C 03E00008 */ jr $ra -/* 024D0 8098B350 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s deleted file mode 100644 index 23740dae4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ /dev/null @@ -1,417 +0,0 @@ -.rdata -glabel D_8098CA14 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA28 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA3C - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB54 - .float 0.2 - -glabel D_8098CB58 - .float 0.02 - -glabel D_8098CB5C - .word 0x3C8EFA35 - -.text -glabel func_8098B354 -/* 024D4 8098B354 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 024D8 8098B358 AFB60068 */ sw $s6, 0x0068($sp) -/* 024DC 8098B35C 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 024E0 8098B360 AFBF0074 */ sw $ra, 0x0074($sp) -/* 024E4 8098B364 AFBE0070 */ sw $s8, 0x0070($sp) -/* 024E8 8098B368 AFB7006C */ sw $s7, 0x006C($sp) -/* 024EC 8098B36C AFB50064 */ sw $s5, 0x0064($sp) -/* 024F0 8098B370 AFB40060 */ sw $s4, 0x0060($sp) -/* 024F4 8098B374 AFB3005C */ sw $s3, 0x005C($sp) -/* 024F8 8098B378 AFB20058 */ sw $s2, 0x0058($sp) -/* 024FC 8098B37C AFB10054 */ sw $s1, 0x0054($sp) -/* 02500 8098B380 AFB00050 */ sw $s0, 0x0050($sp) -/* 02504 8098B384 F7BE0048 */ sdc1 $f30, 0x0048($sp) -/* 02508 8098B388 F7BC0040 */ sdc1 $f28, 0x0040($sp) -/* 0250C 8098B38C F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 02510 8098B390 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 02514 8098B394 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 02518 8098B398 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0251C 8098B39C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02520 8098B3A0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02524 8098B3A4 3C068099 */ lui $a2, %hi(D_8098CA14) ## $a2 = 80990000 -/* 02528 8098B3A8 24C6CA14 */ addiu $a2, $a2, %lo(D_8098CA14) ## $a2 = 8098CA14 -/* 0252C 8098B3AC 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 -/* 02530 8098B3B0 24070982 */ addiu $a3, $zero, 0x0982 ## $a3 = 00000982 -/* 02534 8098B3B4 0C031AB1 */ jal Graph_OpenDisps -/* 02538 8098B3B8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0253C 8098B3BC 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -/* 02540 8098B3C0 3C178099 */ lui $s7, %hi(D_8098C4F0) ## $s7 = 80990000 -/* 02544 8098B3C4 26F7C4F0 */ addiu $s7, $s7, %lo(D_8098C4F0) ## $s7 = 8098C4F0 -/* 02548 8098B3C8 28610014 */ slti $at, $v1, 0x0014 -/* 0254C 8098B3CC 10200004 */ beq $at, $zero, .L8098B3E0 -/* 02550 8098B3D0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 02554 8098B3D4 246E0001 */ addiu $t6, $v1, 0x0001 ## $t6 = 00000001 -/* 02558 8098B3D8 A22E014D */ sb $t6, 0x014D($s1) ## 0000014D -/* 0255C 8098B3DC 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 00000001 -.L8098B3E0: -/* 02560 8098B3E0 2454FFFF */ addiu $s4, $v0, 0xFFFF ## $s4 = 00000000 -/* 02564 8098B3E4 0014A400 */ sll $s4, $s4, 16 -/* 02568 8098B3E8 0014A403 */ sra $s4, $s4, 16 -/* 0256C 8098B3EC 0680012F */ bltz $s4, .L8098B8AC -/* 02570 8098B3F0 3C018099 */ lui $at, %hi(D_8098CB54) ## $at = 80990000 -/* 02574 8098B3F4 C43ECB54 */ lwc1 $f30, %lo(D_8098CB54)($at) -/* 02578 8098B3F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0257C 8098B3FC 4481D000 */ mtc1 $at, $f26 ## $f26 = 1.00 -/* 02580 8098B400 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 02584 8098B404 4481C000 */ mtc1 $at, $f24 ## $f24 = 16.00 -/* 02588 8098B408 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0258C 8098B40C 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 02590 8098B410 4480E000 */ mtc1 $zero, $f28 ## $f28 = 0.00 -/* 02594 8098B414 241E0001 */ addiu $s8, $zero, 0x0001 ## $s8 = 00000001 -/* 02598 8098B418 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098B41C: -/* 0259C 8098B41C 44942000 */ mtc1 $s4, $f4 ## $f4 = 0.00 -/* 025A0 8098B420 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 025A4 8098B424 44834000 */ mtc1 $v1, $f8 ## $f8 = 0.00 -/* 025A8 8098B428 468021A0 */ cvt.s.w $f6, $f4 -/* 025AC 8098B42C 04610004 */ bgez $v1, .L8098B440 -/* 025B0 8098B430 468042A0 */ cvt.s.w $f10, $f8 -/* 025B4 8098B434 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 025B8 8098B438 00000000 */ nop -/* 025BC 8098B43C 46105280 */ add.s $f10, $f10, $f16 -.L8098B440: -/* 025C0 8098B440 460A3483 */ div.s $f18, $f6, $f10 -/* 025C4 8098B444 00147880 */ sll $t7, $s4, 2 -/* 025C8 8098B448 01F47821 */ addu $t7, $t7, $s4 -/* 025CC 8098B44C 000F78C0 */ sll $t7, $t7, 3 -/* 025D0 8098B450 022F8021 */ addu $s0, $s1, $t7 -/* 025D4 8098B454 92020172 */ lbu $v0, 0x0172($s0) ## 00000172 -/* 025D8 8098B458 10400007 */ beq $v0, $zero, .L8098B478 -/* 025DC 8098B45C 4612D501 */ sub.s $f20, $f26, $f18 -/* 025E0 8098B460 105E0035 */ beq $v0, $s8, .L8098B538 -/* 025E4 8098B464 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 025E8 8098B468 1041004D */ beq $v0, $at, .L8098B5A0 -/* 025EC 8098B46C 268E0001 */ addiu $t6, $s4, 0x0001 ## $t6 = 00000001 -/* 025F0 8098B470 10000052 */ beq $zero, $zero, .L8098B5BC -/* 025F4 8098B474 00000000 */ nop -.L8098B478: -/* 025F8 8098B478 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 025FC 8098B47C A6000170 */ sh $zero, 0x0170($s0) ## 00000170 -/* 02600 8098B480 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02604 8098B484 E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 02608 8098B488 46160201 */ sub.s $f8, $f0, $f22 -/* 0260C 8098B48C 46184402 */ mul.s $f16, $f8, $f24 -/* 02610 8098B490 00000000 */ nop -/* 02614 8098B494 46148182 */ mul.s $f6, $f16, $f20 -/* 02618 8098B498 4600328D */ trunc.w.s $f10, $f6 -/* 0261C 8098B49C 44195000 */ mfc1 $t9, $f10 -/* 02620 8098B4A0 00000000 */ nop -/* 02624 8098B4A4 00194400 */ sll $t0, $t9, 16 -/* 02628 8098B4A8 00084C03 */ sra $t1, $t0, 16 -/* 0262C 8098B4AC 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 02630 8098B4B0 00000000 */ nop -/* 02634 8098B4B4 46809120 */ cvt.s.w $f4, $f18 -/* 02638 8098B4B8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0263C 8098B4BC E6040150 */ swc1 $f4, 0x0150($s0) ## 00000150 -/* 02640 8098B4C0 46160201 */ sub.s $f8, $f0, $f22 -/* 02644 8098B4C4 46184402 */ mul.s $f16, $f8, $f24 -/* 02648 8098B4C8 00000000 */ nop -/* 0264C 8098B4CC 46148182 */ mul.s $f6, $f16, $f20 -/* 02650 8098B4D0 4600328D */ trunc.w.s $f10, $f6 -/* 02654 8098B4D4 440B5000 */ mfc1 $t3, $f10 -/* 02658 8098B4D8 00000000 */ nop -/* 0265C 8098B4DC 000B6400 */ sll $t4, $t3, 16 -/* 02660 8098B4E0 000C6C03 */ sra $t5, $t4, 16 -/* 02664 8098B4E4 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 02668 8098B4E8 00000000 */ nop -/* 0266C 8098B4EC 46809120 */ cvt.s.w $f4, $f18 -/* 02670 8098B4F0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02674 8098B4F4 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -/* 02678 8098B4F8 46160201 */ sub.s $f8, $f0, $f22 -/* 0267C 8098B4FC 92080172 */ lbu $t0, 0x0172($s0) ## 00000172 -/* 02680 8098B500 A2000173 */ sb $zero, 0x0173($s0) ## 00000173 -/* 02684 8098B504 46184402 */ mul.s $f16, $f8, $f24 -/* 02688 8098B508 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 0268C 8098B50C A2090172 */ sb $t1, 0x0172($s0) ## 00000172 -/* 02690 8098B510 46148182 */ mul.s $f6, $f16, $f20 -/* 02694 8098B514 4600328D */ trunc.w.s $f10, $f6 -/* 02698 8098B518 440F5000 */ mfc1 $t7, $f10 -/* 0269C 8098B51C 00000000 */ nop -/* 026A0 8098B520 000FC400 */ sll $t8, $t7, 16 -/* 026A4 8098B524 0018CC03 */ sra $t9, $t8, 16 -/* 026A8 8098B528 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 026AC 8098B52C 00000000 */ nop -/* 026B0 8098B530 46809120 */ cvt.s.w $f4, $f18 -/* 026B4 8098B534 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L8098B538: -/* 026B8 8098B538 3C058099 */ lui $a1, %hi(D_8098CFA4) ## $a1 = 80990000 -/* 026BC 8098B53C 3C068099 */ lui $a2, %hi(D_8098CFA8) ## $a2 = 80990000 -/* 026C0 8098B540 3C078099 */ lui $a3, %hi(D_8098C504) ## $a3 = 80990000 -/* 026C4 8098B544 260A0170 */ addiu $t2, $s0, 0x0170 ## $t2 = 00000170 -/* 026C8 8098B548 260B016C */ addiu $t3, $s0, 0x016C ## $t3 = 0000016C -/* 026CC 8098B54C AFAB0014 */ sw $t3, 0x0014($sp) -/* 026D0 8098B550 AFAA0010 */ sw $t2, 0x0010($sp) -/* 026D4 8098B554 24E7C504 */ addiu $a3, $a3, %lo(D_8098C504) ## $a3 = 8098C504 -/* 026D8 8098B558 24C6CFA8 */ addiu $a2, $a2, %lo(D_8098CFA8) ## $a2 = 8098CFA8 -/* 026DC 8098B55C 24A5CFA4 */ addiu $a1, $a1, %lo(D_8098CFA4) ## $a1 = 8098CFA4 -/* 026E0 8098B560 0C02ECAD */ jal func_800BB2B4 -/* 026E4 8098B564 27A400D4 */ addiu $a0, $sp, 0x00D4 ## $a0 = FFFFFFE4 -/* 026E8 8098B568 10400004 */ beq $v0, $zero, .L8098B57C -/* 026EC 8098B56C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFC4 -/* 026F0 8098B570 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 026F4 8098B574 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 026F8 8098B578 A20D0172 */ sb $t5, 0x0172($s0) ## 00000172 -.L8098B57C: -/* 026FC 8098B57C 0C00BBC5 */ jal Actor_GetWorld -/* 02700 8098B580 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02704 8098B584 3C068099 */ lui $a2, %hi(D_8098CFB8) ## $a2 = 80990000 -/* 02708 8098B588 24C6CFB8 */ addiu $a2, $a2, %lo(D_8098CFB8) ## $a2 = 8098CFB8 -/* 0270C 8098B58C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFC4 -/* 02710 8098B590 0C262ADA */ jal func_8098AB68 -/* 02714 8098B594 27A500D4 */ addiu $a1, $sp, 0x00D4 ## $a1 = FFFFFFE4 -/* 02718 8098B598 10000008 */ beq $zero, $zero, .L8098B5BC -/* 0271C 8098B59C 00000000 */ nop -.L8098B5A0: -/* 02720 8098B5A0 15C30006 */ bne $t6, $v1, .L8098B5BC -/* 02724 8098B5A4 00000000 */ nop -/* 02728 8098B5A8 92CF1D6C */ lbu $t7, 0x1D6C($s6) ## 00001D6C -/* 0272C 8098B5AC 15E00003 */ bne $t7, $zero, .L8098B5BC -/* 02730 8098B5B0 00000000 */ nop -/* 02734 8098B5B4 0C00B55C */ jal Actor_Kill - -/* 02738 8098B5B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8098B5BC: -/* 0273C 8098B5BC 3C018099 */ lui $at, %hi(D_8098CFB8) ## $at = 80990000 -/* 02740 8098B5C0 C428CFB8 */ lwc1 $f8, %lo(D_8098CFB8)($at) -/* 02744 8098B5C4 92020173 */ lbu $v0, 0x0173($s0) ## 00000173 -/* 02748 8098B5C8 E608015C */ swc1 $f8, 0x015C($s0) ## 0000015C -/* 0274C 8098B5CC C430CFBC */ lwc1 $f16, %lo(D_8098CFBC)($at) -/* 02750 8098B5D0 3C018099 */ lui $at, %hi(D_8098CFC0) ## $at = 80990000 -/* 02754 8098B5D4 E6100160 */ swc1 $f16, 0x0160($s0) ## 00000160 -/* 02758 8098B5D8 C426CFC0 */ lwc1 $f6, %lo(D_8098CFC0)($at) -/* 0275C 8098B5DC 10400007 */ beq $v0, $zero, .L8098B5FC -/* 02760 8098B5E0 E6060164 */ swc1 $f6, 0x0164($s0) ## 00000164 -/* 02764 8098B5E4 105E000B */ beq $v0, $s8, .L8098B614 -/* 02768 8098B5E8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0276C 8098B5EC 10410018 */ beq $v0, $at, .L8098B650 -/* 02770 8098B5F0 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 02774 8098B5F4 10000050 */ beq $zero, $zero, .L8098B738 -/* 02778 8098B5F8 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098B5FC: -/* 0277C 8098B5FC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02780 8098B600 00000000 */ nop -/* 02784 8098B604 92180173 */ lbu $t8, 0x0173($s0) ## 00000173 -/* 02788 8098B608 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0278C 8098B60C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 02790 8098B610 A2190173 */ sb $t9, 0x0173($s0) ## 00000173 -.L8098B614: -/* 02794 8098B614 4405D000 */ mfc1 $a1, $f26 -/* 02798 8098B618 4406B000 */ mfc1 $a2, $f22 -/* 0279C 8098B61C 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 -/* 027A0 8098B620 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD -/* 027A4 8098B624 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 027A8 8098B628 0C01E0C4 */ jal Math_SmoothStepToF - -/* 027AC 8098B62C E7BE0010 */ swc1 $f30, 0x0010($sp) -/* 027B0 8098B630 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 027B4 8098B634 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 027B8 8098B638 460AD03E */ c.le.s $f26, $f10 -/* 027BC 8098B63C 00000000 */ nop -/* 027C0 8098B640 4502003D */ bc1fl .L8098B738 -/* 027C4 8098B644 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 027C8 8098B648 1000003A */ beq $zero, $zero, .L8098B734 -/* 027CC 8098B64C A2080173 */ sb $t0, 0x0173($s0) ## 00000173 -.L8098B650: -/* 027D0 8098B650 4405E000 */ mfc1 $a1, $f28 -/* 027D4 8098B654 4406B000 */ mfc1 $a2, $f22 -/* 027D8 8098B658 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 -/* 027DC 8098B65C 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 027E0 8098B660 0C01E0C4 */ jal Math_SmoothStepToF - -/* 027E4 8098B664 E7BE0010 */ swc1 $f30, 0x0010($sp) -/* 027E8 8098B668 C6120168 */ lwc1 $f18, 0x0168($s0) ## 00000168 -/* 027EC 8098B66C 461C903E */ c.le.s $f18, $f28 -/* 027F0 8098B670 00000000 */ nop -/* 027F4 8098B674 45020030 */ bc1fl .L8098B738 -/* 027F8 8098B678 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 027FC 8098B67C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02800 8098B680 00000000 */ nop -/* 02804 8098B684 46160101 */ sub.s $f4, $f0, $f22 -/* 02808 8098B688 46182202 */ mul.s $f8, $f4, $f24 -/* 0280C 8098B68C 00000000 */ nop -/* 02810 8098B690 46144402 */ mul.s $f16, $f8, $f20 -/* 02814 8098B694 4600818D */ trunc.w.s $f6, $f16 -/* 02818 8098B698 440A3000 */ mfc1 $t2, $f6 -/* 0281C 8098B69C 00000000 */ nop -/* 02820 8098B6A0 000A5C00 */ sll $t3, $t2, 16 -/* 02824 8098B6A4 000B6403 */ sra $t4, $t3, 16 -/* 02828 8098B6A8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 0282C 8098B6AC 00000000 */ nop -/* 02830 8098B6B0 468054A0 */ cvt.s.w $f18, $f10 -/* 02834 8098B6B4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02838 8098B6B8 E6120150 */ swc1 $f18, 0x0150($s0) ## 00000150 -/* 0283C 8098B6BC 46160101 */ sub.s $f4, $f0, $f22 -/* 02840 8098B6C0 46182202 */ mul.s $f8, $f4, $f24 -/* 02844 8098B6C4 00000000 */ nop -/* 02848 8098B6C8 46144402 */ mul.s $f16, $f8, $f20 -/* 0284C 8098B6CC 4600818D */ trunc.w.s $f6, $f16 -/* 02850 8098B6D0 440E3000 */ mfc1 $t6, $f6 -/* 02854 8098B6D4 00000000 */ nop -/* 02858 8098B6D8 000E7C00 */ sll $t7, $t6, 16 -/* 0285C 8098B6DC 000FC403 */ sra $t8, $t7, 16 -/* 02860 8098B6E0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 02864 8098B6E4 00000000 */ nop -/* 02868 8098B6E8 468054A0 */ cvt.s.w $f18, $f10 -/* 0286C 8098B6EC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02870 8098B6F0 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 -/* 02874 8098B6F4 46160101 */ sub.s $f4, $f0, $f22 -/* 02878 8098B6F8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0287C 8098B6FC E61C0168 */ swc1 $f28, 0x0168($s0) ## 00000168 -/* 02880 8098B700 A20B0173 */ sb $t3, 0x0173($s0) ## 00000173 -/* 02884 8098B704 46182202 */ mul.s $f8, $f4, $f24 -/* 02888 8098B708 00000000 */ nop -/* 0288C 8098B70C 46144402 */ mul.s $f16, $f8, $f20 -/* 02890 8098B710 4600818D */ trunc.w.s $f6, $f16 -/* 02894 8098B714 44083000 */ mfc1 $t0, $f6 -/* 02898 8098B718 00000000 */ nop -/* 0289C 8098B71C 00084C00 */ sll $t1, $t0, 16 -/* 028A0 8098B720 00095403 */ sra $t2, $t1, 16 -/* 028A4 8098B724 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 028A8 8098B728 00000000 */ nop -/* 028AC 8098B72C 468054A0 */ cvt.s.w $f18, $f10 -/* 028B0 8098B730 E6120158 */ swc1 $f18, 0x0158($s0) ## 00000158 -.L8098B734: -/* 028B4 8098B734 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098B738: -/* 028B8 8098B738 C6120150 */ lwc1 $f18, 0x0150($s0) ## 00000150 -/* 028BC 8098B73C C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 028C0 8098B740 C60A0154 */ lwc1 $f10, 0x0154($s0) ## 00000154 -/* 028C4 8098B744 C6080160 */ lwc1 $f8, 0x0160($s0) ## 00000160 -/* 028C8 8098B748 46109300 */ add.s $f12, $f18, $f16 -/* 028CC 8098B74C C6100158 */ lwc1 $f16, 0x0158($s0) ## 00000158 -/* 028D0 8098B750 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 028D4 8098B754 46085380 */ add.s $f14, $f10, $f8 -/* 028D8 8098B758 29810002 */ slti $at, $t4, 0x0002 -/* 028DC 8098B75C 1020004E */ beq $at, $zero, .L8098B898 -/* 028E0 8098B760 46128000 */ add.s $f0, $f16, $f18 -/* 028E4 8098B764 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 028E8 8098B768 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 028EC 8098B76C 44060000 */ mfc1 $a2, $f0 -/* 028F0 8098B770 3C150401 */ lui $s5, %hi(gEffFlash1DL) ## $s5 = 04010000 -/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(gEffFlash1DL) ## $s5 = 04010130 -/* 028F8 8098B778 02C19021 */ addu $s2, $s6, $at -/* 028FC 8098B77C 0C034261 */ jal Matrix_Translate -/* 02900 8098B780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02904 8098B784 3C018099 */ lui $at, %hi(D_8098CB58) ## $at = 80990000 -/* 02908 8098B788 C428CB58 */ lwc1 $f8, %lo(D_8098CB58)($at) -/* 0290C 8098B78C C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 02910 8098B790 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02914 8098B794 46144402 */ mul.s $f16, $f8, $f20 -/* 02918 8098B798 00000000 */ nop -/* 0291C 8098B79C 46102302 */ mul.s $f12, $f4, $f16 -/* 02920 8098B7A0 44066000 */ mfc1 $a2, $f12 -/* 02924 8098B7A4 0C0342A3 */ jal Matrix_Scale -/* 02928 8098B7A8 46006386 */ mov.s $f14, $f12 -/* 0292C 8098B7AC 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02930 8098B7B0 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 02934 8098B7B4 35CE0080 */ ori $t6, $t6, 0x0080 ## $t6 = FA000080 -/* 02938 8098B7B8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0293C 8098B7BC AE6D02D0 */ sw $t5, 0x02D0($s3) ## 000002D0 -/* 02940 8098B7C0 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02944 8098B7C4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02948 8098B7C8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0294C 8098B7CC 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02950 8098B7D0 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 02954 8098B7D4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02958 8098B7D8 AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 0295C 8098B7DC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02960 8098B7E0 92EC0009 */ lbu $t4, 0x0009($s7) ## 8098C4F9 -/* 02964 8098B7E4 92E9000B */ lbu $t1, 0x000B($s7) ## 8098C4FB -/* 02968 8098B7E8 92F8000A */ lbu $t8, 0x000A($s7) ## 8098C4FA -/* 0296C 8098B7EC 000C6E00 */ sll $t5, $t4, 24 -/* 02970 8098B7F0 00095200 */ sll $t2, $t1, 8 -/* 02974 8098B7F4 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000008 -/* 02978 8098B7F8 0018CC00 */ sll $t9, $t8, 16 -/* 0297C 8098B7FC 01D94025 */ or $t0, $t6, $t9 ## $t0 = FB000008 -/* 02980 8098B800 350900FF */ ori $t1, $t0, 0x00FF ## $t1 = FB0000FF -/* 02984 8098B804 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02988 8098B808 0C024F61 */ jal func_80093D84 -/* 0298C 8098B80C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 02990 8098B810 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02994 8098B814 0C03424C */ jal Matrix_Mult -/* 02998 8098B818 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0299C 8098B81C 860B0174 */ lh $t3, 0x0174($s0) ## 00000174 -/* 029A0 8098B820 3C018099 */ lui $at, %hi(D_8098CB5C) ## $at = 80990000 -/* 029A4 8098B824 C432CB5C */ lwc1 $f18, %lo(D_8098CB5C)($at) -/* 029A8 8098B828 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 029AC 8098B82C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 029B0 8098B830 468032A0 */ cvt.s.w $f10, $f6 -/* 029B4 8098B834 46125302 */ mul.s $f12, $f10, $f18 -/* 029B8 8098B838 0C0343B5 */ jal Matrix_RotateZ -/* 029BC 8098B83C 00000000 */ nop -/* 029C0 8098B840 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 029C4 8098B844 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 029C8 8098B848 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 029CC 8098B84C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 029D0 8098B850 AE6C02D0 */ sw $t4, 0x02D0($s3) ## 000002D0 -/* 029D4 8098B854 3C058099 */ lui $a1, %hi(D_8098CA28) ## $a1 = 80990000 -/* 029D8 8098B858 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 029DC 8098B85C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 029E0 8098B860 24A5CA28 */ addiu $a1, $a1, %lo(D_8098CA28) ## $a1 = 8098CA28 -/* 029E4 8098B864 24060A0C */ addiu $a2, $zero, 0x0A0C ## $a2 = 00000A0C -/* 029E8 8098B868 0C0346A2 */ jal Matrix_NewMtx -/* 029EC 8098B86C 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 -/* 029F0 8098B870 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 -/* 029F4 8098B874 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 029F8 8098B878 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 029FC 8098B87C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02A00 8098B880 AE6D02D0 */ sw $t5, 0x02D0($s3) ## 000002D0 -/* 02A04 8098B884 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 02A08 8098B888 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 02A0C 8098B88C 86180174 */ lh $t8, 0x0174($s0) ## 00000174 -/* 02A10 8098B890 270E0190 */ addiu $t6, $t8, 0x0190 ## $t6 = 00000190 -/* 02A14 8098B894 A60E0174 */ sh $t6, 0x0174($s0) ## 00000174 -.L8098B898: -/* 02A18 8098B898 2694FFFF */ addiu $s4, $s4, 0xFFFF ## $s4 = FFFFFFFF -/* 02A1C 8098B89C 0014A400 */ sll $s4, $s4, 16 -/* 02A20 8098B8A0 0014A403 */ sra $s4, $s4, 16 -/* 02A24 8098B8A4 0683FEDD */ bgezl $s4, .L8098B41C -/* 02A28 8098B8A8 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098B8AC: -/* 02A2C 8098B8AC 3C068099 */ lui $a2, %hi(D_8098CA3C) ## $a2 = 80990000 -/* 02A30 8098B8B0 24C6CA3C */ addiu $a2, $a2, %lo(D_8098CA3C) ## $a2 = 8098CA3C -/* 02A34 8098B8B4 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 -/* 02A38 8098B8B8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 02A3C 8098B8BC 0C031AD5 */ jal Graph_CloseDisps -/* 02A40 8098B8C0 24070A13 */ addiu $a3, $zero, 0x0A13 ## $a3 = 00000A13 -/* 02A44 8098B8C4 8FBF0074 */ lw $ra, 0x0074($sp) -/* 02A48 8098B8C8 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 02A4C 8098B8CC D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 02A50 8098B8D0 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 02A54 8098B8D4 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 02A58 8098B8D8 D7BC0040 */ ldc1 $f28, 0x0040($sp) -/* 02A5C 8098B8DC D7BE0048 */ ldc1 $f30, 0x0048($sp) -/* 02A60 8098B8E0 8FB00050 */ lw $s0, 0x0050($sp) -/* 02A64 8098B8E4 8FB10054 */ lw $s1, 0x0054($sp) -/* 02A68 8098B8E8 8FB20058 */ lw $s2, 0x0058($sp) -/* 02A6C 8098B8EC 8FB3005C */ lw $s3, 0x005C($sp) -/* 02A70 8098B8F0 8FB40060 */ lw $s4, 0x0060($sp) -/* 02A74 8098B8F4 8FB50064 */ lw $s5, 0x0064($sp) -/* 02A78 8098B8F8 8FB60068 */ lw $s6, 0x0068($sp) -/* 02A7C 8098B8FC 8FB7006C */ lw $s7, 0x006C($sp) -/* 02A80 8098B900 8FBE0070 */ lw $s8, 0x0070($sp) -/* 02A84 8098B904 03E00008 */ jr $ra -/* 02A88 8098B908 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 -/* 02A8C 8098B90C 00000000 */ nop diff --git a/data/overlays/actors/z_demo_kankyo.bss.s b/data/overlays/actors/z_demo_kankyo.bss.s deleted file mode 100644 index b7dbe6bf46..0000000000 --- a/data/overlays/actors/z_demo_kankyo.bss.s +++ /dev/null @@ -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 .bss - -.balign 16 - -glabel D_8098CF80 - .space 0x02 -glabel D_8098CF82 - .space 0x02 -glabel D_8098CF84 - .space 0x04 -glabel D_8098CF88 - .space 0x04 -glabel D_8098CF8C - .space 0x0C -glabel D_8098CF98 - .space 0x04 -glabel D_8098CF9C - .space 0x04 -glabel D_8098CFA0 - .space 0x04 -glabel D_8098CFA4 - .space 0x04 -glabel D_8098CFA8 - .space 0x10 -glabel D_8098CFB8 - .space 0x04 -glabel D_8098CFBC - .space 0x04 -glabel D_8098CFC0 - .space 0x10 - diff --git a/data/overlays/actors/z_demo_kankyo.data.s b/data/overlays/actors/z_demo_kankyo.data.s deleted file mode 100644 index 69c5e43c9e..0000000000 --- a/data/overlays/actors/z_demo_kankyo.data.s +++ /dev/null @@ -1,46 +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_8098B910 - .word 0x00000002, 0x000000A4, 0x00000005, 0x00010000, 0x00870000, 0x00000000, 0x42714CA7, 0x001F004F, 0x003B010F, 0x00000000, 0x42714CA7, 0x001F004E, 0x003C0120, 0x00000000, 0x42714CA7, 0x0020004E, 0x003C0131, 0x00000000, 0x42714CA7, 0x001E004F, 0x003B01F4, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C01F6, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C0207, 0xFF000000, 0x42714CA7, 0x001E004E, 0x003C0000, 0x00000006, 0x00010000, 0x00A40000, 0x0000001E, 0x42714CA7, 0x000B0032, 0x0017010F, 0x0000001E, 0x42714CA7, 0x000B0030, 0x00160120, 0x00000007, 0x42714CA7, 0x000B0030, 0x00160131, 0x00000007, 0x42714CA7, 0x00390065, 0x001501F4, 0x0000001E, 0x42714CA7, 0x00390065, 0x001501F6, 0x0000001E, 0x42714CA7, 0x00390065, 0x00150207, 0xFF00001E, 0x42714CA7, 0x00390065, 0x00150000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098BA20 - .word 0x00000005, 0x0000048F, 0x00000005, 0x00010000, 0x04720000, 0x00000000, 0x42714CA8, 0x001F0052, 0x003D20BA, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA1BC, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5E1, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5CB, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5EB, 0x00000000, 0x42714CA8, 0x001F0052, 0x003D20BA, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA1BC, 0xFF000000, 0x42714CA8, 0x001F0052, 0x003DA5E1, 0x00000006, 0x00010000, 0x048F0000, 0x0000001E, 0x42714CA8, 0x00370063, 0x001F20BA, 0x0000001E, 0x42714CA8, 0x00370063, 0x001FA1BC, 0x0000000A, 0x42714CA8, 0x00370063, 0x001FA5E1, 0x00000007, 0x42714CA8, 0x0011003B, 0x001FA5CB, 0x0000001E, 0x42714CA8, 0x0011003B, 0x001FA5EB, 0x000003E8, 0x42714CA8, 0x0011003B, 0x001F20BA, 0x0000001E, 0x42714CA8, 0x0011003B, 0x001FA1BC, 0xFF00001E, 0x42714CA8, 0x0011003B, 0x001FA5E1, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000003, 0x00000001, 0x000C005F, 0x00610000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_8098BBA0 - .word 0x00000002, 0x00000076, 0x00000005, 0x00010000, 0x00590000, 0x00000000, 0x428EA647, 0x00350035, 0x0028010F, 0x00000000, 0x42700000, 0x00350035, 0x00280120, 0x00000000, 0x42700000, 0x00350035, 0x00280131, 0x00000000, 0x428D3328, 0x003A0066, 0x003001F4, 0x00000000, 0x428D3328, 0x003A0066, 0x003001F6, 0x00000000, 0x428D3328, 0x003A0066, 0x00300207, 0xFF000000, 0x428D3328, 0x003A0066, 0x00300047, 0x00000006, 0x00010000, 0x00760000, 0x00000007, 0x428D0CAF, 0x000B001D, 0x000A010F, 0x00000007, 0x428CCCC2, 0x000B001D, 0x000A0120, 0x00000007, 0x428D3328, 0x000B001D, 0x000A0131, 0x00000007, 0x428D3328, 0x001D0047, 0x001901F4, 0x0000001E, 0x428D3328, 0x001D0047, 0x001901F6, 0x0000001E, 0x428D3328, 0x001D0047, 0x00190207, 0xFF00001E, 0x428D3328, 0x001D0047, 0x00190047, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098BCB0 - .word 0x00000005, 0x00000460, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04430000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0xFF000000, 0x42714CA8, 0x002A0059, 0x003229D0, 0x00000006, 0x00010000, 0x04600000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0x000003E8, 0x42714CA8, 0x00180042, 0x001D0000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0xFF00001E, 0x42714CA8, 0x00180042, 0x001D29D0, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_8098BDD0 - .word 0x00000002, 0x0000048C, 0x00000005, 0x00010000, 0x046F0000, 0x00000000, 0x42714CA7, 0x001F0044, 0x003B010F, 0x00000000, 0x42714CA7, 0x00200044, 0x003C0120, 0x00000000, 0x42714CA7, 0x001F0045, 0x003B0131, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B01F4, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B01F6, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B0207, 0x00000000, 0x42714CA7, 0x001F0040, 0x003BB46C, 0xFF000000, 0x42714CA7, 0x001F0040, 0x003B05BC, 0x00000006, 0x00010000, 0x048C0000, 0x0000001E, 0x42714CA7, 0x000C0028, 0x0016010F, 0x0000001E, 0x42714CA7, 0x000B0026, 0x00160120, 0x00000007, 0x42714CA7, 0x000B0027, 0x00160131, 0x00000007, 0x42714CA7, 0x00390056, 0x001501F4, 0x0000001E, 0x42714CA7, 0x00390056, 0x001501F6, 0x000003E8, 0x42714CA7, 0x00390056, 0x00150207, 0x0000001E, 0x42714CA7, 0x00390056, 0x0015B46C, 0xFF00001E, 0x42714CA7, 0x00390056, 0x001505BC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098BF00 - .word 0x00000005, 0x0000048F, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04720000, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DA8A5, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DA3D9, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DF3A5, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5D5, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5E7, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5EC, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BBCA5, 0xFF000000, 0x42714CA9, 0x001D003D, 0x003BEEC0, 0x00000006, 0x00010000, 0x048F0000, 0x0000001E, 0x42714CA8, 0x0036004F, 0x001FA8A5, 0x0000001E, 0x42714CA8, 0x00360050, 0x001FA3D9, 0x0000000A, 0x42714CA8, 0x0036004F, 0x001FF3A5, 0x00000007, 0x42714CA9, 0x000F002A, 0x001EA5D5, 0x0000001E, 0x42714CA9, 0x000F002A, 0x001EA5E7, 0x000003E8, 0x42714CA9, 0x000F002A, 0x001EA5EC, 0x0000001E, 0x42714CA9, 0x000F002A, 0x001EBCA5, 0xFF00001E, 0x42714CA9, 0x000F002A, 0x001EEEC0, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_8098C080 - .word 0x00000002, 0x0000045E, 0x00000005, 0x00010000, 0x04410000, 0x00000000, 0x428EA647, 0x00350035, 0x0028010F, 0x00000000, 0x42700000, 0x00350035, 0x00280120, 0x00000000, 0x42700000, 0x00350035, 0x00280131, 0x00000000, 0x428D3328, 0x003A0059, 0x002F01F4, 0x00000000, 0x428D3328, 0x003A0059, 0x002F01F6, 0x00000000, 0x428D3328, 0x003A0059, 0x002F0207, 0x00000000, 0x428D3328, 0x003A0059, 0x002F0000, 0xFF000000, 0x428D3328, 0x003A0059, 0x002F0000, 0x00000006, 0x00010000, 0x045E0000, 0x00000007, 0x428D0CAF, 0x000B001D, 0x000A010F, 0x00000007, 0x428CCCC2, 0x000B001D, 0x000A0120, 0x00000007, 0x428D3328, 0x000B001D, 0x000A0131, 0x00000007, 0x428D3328, 0x001D003A, 0x001901F4, 0x0000001E, 0x428D3328, 0x001D003A, 0x001901F6, 0x000003E8, 0x428D3328, 0x001D003A, 0x00190207, 0x0000001E, 0x428D3328, 0x001D003A, 0x00190000, 0xFF00001E, 0x428D3328, 0x001D003A, 0x00190000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098C1B0 - .word 0x00000005, 0x00000460, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04430000, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311F1C, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311F8C, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311FFC, 0x00000000, 0x42714CAA, 0x0029004B, 0x0031206C, 0xFF000000, 0x42714CAA, 0x0029004B, 0x003120DC, 0x00000006, 0x00010000, 0x04600000, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D1F1C, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D1F8C, 0x000003E8, 0x42714CAA, 0x00180034, 0x001D1FFC, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D206C, 0xFF00001E, 0x42714CAA, 0x00180034, 0x001D20DC, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel Demo_Kankyo_InitVars - .word 0x008C0100, 0x00000030, 0x00010000, 0x00000604 -.word DemoKankyo_Init -.word DemoKankyo_Destroy -.word DemoKankyo_Update -.word DemoKankyo_Draw -glabel D_8098C2F0 - .word 0x00920092, 0x00920092, 0x00920092, 0x00920001, 0x00B600B6, 0x00B600B6, 0x00B6005E, 0x005E0001, 0x00010001, 0x00000000, 0x43160000 -glabel D_8098C31C - .word 0x00C800FF, 0x32000096, 0xFFFF9600, 0xC832FFC8, 0xFF000000 -glabel D_8098C330 - .word 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0xFFE60000, 0x00000000, 0x00000008, 0x42340000, 0x00000017, 0x00240000, 0x00000008, 0x42340000, 0x001C0032, 0xFFFF0000, 0x00000008, 0x42340000, 0x00010018, 0xFFD90000, 0x00000008, 0x42340000, 0xFFE6FFFA, 0x00030000, 0x00000008, 0x42340000, 0x00000025, 0x00370000, 0x00000008, 0x42340000, 0x004F0066, 0x00290000, 0x00000008, 0x42340000, 0x00A600AD, 0x00060000, 0x00000005, 0x42340000, 0x010D015A, 0xFF4C0000, 0x00000005, 0x42340000, 0x019F0245, 0xFE350000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000 -glabel D_8098C410 - .word 0x00000005, 0x42340000, 0x019F0245, 0xFE350000, 0x00000005, 0x42340000, 0x010D015A, 0xFF4C0000, 0x00000008, 0x42340000, 0x00A600AD, 0x00060000, 0x00000008, 0x42340000, 0x004F0066, 0x00290000, 0x00000008, 0x42340000, 0x00000025, 0x00370000, 0x00000008, 0x42340000, 0xFFE6FFFA, 0x00030000, 0x00000008, 0x42340000, 0x00010018, 0xFFD90000, 0x00000008, 0x42340000, 0x001C0032, 0xFFFF0000, 0x00000008, 0x42340000, 0x00000017, 0x00240000, 0x00000008, 0x42340000, 0xFFE60000, 0x00000000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000 -glabel D_8098C4F0 - .word 0x00C800FF, 0x32000096, 0xFFFF9600, 0x00FFFFC8, 0xFF000000 -glabel D_8098C504 - .word 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFD70000, 0xFFE90000, 0x00000002, 0x42340000, 0xFFD30000, 0x000A0000, 0x00000002, 0x42340000, 0xFFE80001, 0x00270000, 0x00000002, 0x42340000, 0x00150000, 0x002B0000, 0x00000002, 0x42340000, 0x002F0005, 0x000E0000, 0x00000002, 0x42340000, 0x00310005, 0xFFF50000, 0x00000002, 0x42340000, 0x00200005, 0xFFDA0000, 0x00000002, 0x42340000, 0xFFF50005, 0xFFD10000, 0x00000002, 0x42340000, 0xFFD70006, 0xFFEA0000, 0x00000002, 0x42340000, 0xFFD50009, 0x000D0000, 0x00000002, 0x42340000, 0xFFE90009, 0x00270000, 0x00000002, 0x42340000, 0x0014000B, 0x00290000, 0x00000002, 0x42340000, 0x002D000B, 0x000F0000, 0x00000002, 0x42340000, 0x002E000B, 0xFFF00000, 0x00000002, 0x42340000, 0x001E000B, 0xFFDA0000, 0x00000002, 0x42340000, 0xFFFA000E, 0xFFD30000, 0x00000002, 0x42340000, 0xFFDA000E, 0xFFEB0000, 0x00000002, 0x42340000, 0xFFD70010, 0x00080000, 0x00000002, 0x42340000, 0xFFE90010, 0x00240000, 0x00000002, 0x42340000, 0x00110010, 0x00280000, 0x00000002, 0x42340000, 0x002C0010, 0x000D0000, 0x00000002, 0x42340000, 0x002C0012, 0xFFF50000, 0x00000002, 0x42340000, 0x001F0011, 0xFFDE0000, 0x00000002, 0x42340000, 0xFFFB0014, 0xFFD50000, 0x00000002, 0x42340000, 0xFFDD0014, 0xFFEC0000, 0x00000002, 0x42340000, 0xFFDA0017, 0x00080000, 0x00000002, 0x42340000, 0xFFE80014, 0x001F0000, 0x00000002, 0x42340000, 0x000C0018, 0x00260000, 0x00000002, 0x42340000, 0x00270018, 0x000D0000, 0x00000002, 0x42340000, 0x0027001B, 0xFFF60000, 0x00000002, 0x42340000, 0x001C001A, 0xFFE20000, 0x00000002, 0x42340000, 0xFFFA000E, 0xFFD40000, 0x00000002, 0x42340000, 0xFFD9001B, 0xFFEF0000, 0x00000002, 0x42340000, 0xFFD7001B, 0x000A0000, 0x00000002, 0x42340000, 0xFFE6001B, 0x00220000, 0x00000002, 0x42340000, 0x000F001F, 0x002C0000, 0x00000002, 0x42340000, 0x00320020, 0x00090000, 0x00000002, 0x42340000, 0x00300021, 0xFFF00000, 0x00000002, 0x42340000, 0x001C0025, 0xFFD90000, 0x00000002, 0x42340000, 0xFFFA0028, 0xFFD40000, 0x00000002, 0x42340000, 0xFFD8002B, 0xFFF50000, 0x00000002, 0x42340000, 0xFFD7002B, 0x00060000, 0x00000002, 0x42340000, 0xFFDF002B, 0x00190000, 0x00000002, 0x42340000, 0x000E002E, 0x002C0000, 0x00000002, 0x42340000, 0x0032002E, 0x00030000, 0x00000002, 0x42340000, 0x002A0030, 0xFFE70000, 0x00000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0x00000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0xFF000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0xFF000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_demo_kankyo.reloc.s b/data/overlays/actors/z_demo_kankyo.reloc.s deleted file mode 100644 index 427c0db769..0000000000 --- a/data/overlays/actors/z_demo_kankyo.reloc.s +++ /dev/null @@ -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_8098CB60 - .incbin "baserom/ovl_Demo_Kankyo", 0x3CE0, 0x00000420 diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h index f09810de94..0a6f8a2d0c 100644 --- a/include/z64cutscene_commands.h +++ b/include/z64cutscene_commands.h @@ -1,5 +1,5 @@ -#ifndef _Z64CUTSCENE_CMMANDS_H_ -#define _Z64CUTSCENE_CMMANDS_H_ +#ifndef _Z64CUTSCENE_COMMANDS_H_ +#define _Z64CUTSCENE_COMMANDS_H_ #include "command_macros_base.h" #include "z64cutscene.h" diff --git a/spec b/spec index 13f39f1c69..0f3fbc745c 100644 --- a/spec +++ b/spec @@ -1528,10 +1528,16 @@ endseg beginseg name "ovl_Demo_Kankyo" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.o" include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o" - include "build/data/overlays/actors/z_demo_kankyo.data.o" - include "build/data/overlays/actors/z_demo_kankyo.bss.o" - include "build/data/overlays/actors/z_demo_kankyo.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/ovl_Demo_Kankyo_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg b/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg index 55ff099e66..1f3ce3e64d 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg +++ b/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg @@ -1,2 +1,10 @@ ovl_Demo_Kankyo -z_demo_kankyo.c \ No newline at end of file +z_demo_kankyo_cutscene_data1.c +z_demo_kankyo_cutscene_data2.c +z_demo_kankyo_cutscene_data3.c +z_demo_kankyo_cutscene_data4.c +z_demo_kankyo_cutscene_data5.c +z_demo_kankyo_cutscene_data6.c +z_demo_kankyo_cutscene_data7.c +z_demo_kankyo_cutscene_data8.c +z_demo_kankyo.c diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 1125309d50..f85acf6876 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -1,4 +1,5 @@ #include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" #include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000030 @@ -10,14 +11,35 @@ void DemoKankyo_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoKankyo_Update(Actor* thisx, GlobalContext* globalCtx); void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_01000000; -extern UNK_TYPE D_06000080; -extern UNK_TYPE D_06000DE0; -extern UNK_TYPE D_06007440; -extern UNK_TYPE D_06007578; -extern UNK_TYPE D_06008390; +void DemoKankyo_SetupType(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_UpdateClouds(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_UpdateRock(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_DoNothing2(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_UpdateDoorOfTime(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_DoNothing(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_KillDoorOfTimeCollision(DemoKankyo* this, GlobalContext* globalCtx); + +void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx); + +// adult warp songs cutscenes +extern CutsceneData gAdultWarpInCS[]; +extern CutsceneData gAdultWarpOutCS[]; +// adult warp songs cutscenes in temple of time +extern CutsceneData gAdultWarpInToTCS[]; +extern CutsceneData gAdultWarpOutToTCS[]; +// child warp songs cutscenes +extern CutsceneData gChildWarpInCS[]; +extern CutsceneData gChildWarpOutCS[]; +// child warp songs cutscenes in temple of time +extern CutsceneData gChildWarpInToTCS[]; +extern CutsceneData gChildWarpOutToTCS[]; -/* const ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, ACTORCAT_BG, @@ -29,51 +51,948 @@ const ActorInit Demo_Kankyo_InitVars = { (ActorFunc)DemoKankyo_Update, (ActorFunc)DemoKankyo_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s") +static s16 sObjIds[] = { + OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, + OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_GAMEPLAY_KEEP, OBJECT_GI_MELODY, OBJECT_GI_MELODY, + OBJECT_GI_MELODY, OBJECT_GI_MELODY, OBJECT_GI_MELODY, OBJECT_TOKI_OBJECTS, OBJECT_TOKI_OBJECTS, + OBJECT_GAMEPLAY_KEEP, OBJECT_GAMEPLAY_KEEP, OBJECT_GAMEPLAY_KEEP, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s") +// unused, presumed to be floats +static f32 D_8098C314[] = { + 0.0f, + 150.0f, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s") +static Color_RGB8 sWarpSparkleEnvColors[] = { + { 0, 200, 0 }, // minuet + { 255, 50, 0 }, // bolero + { 0, 150, 255 }, // serenade + { 255, 150, 0 }, // requiem + { 200, 50, 255 }, // nocturne + { 200, 255, 0 }, // prelude +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s") +static CutsceneCameraPoint sWarpOutCameraPoints[] = { + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0x0000, 0x0000 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0017, 0x0024 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x001C, 0x0032, 0xFFFF } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0001, 0x0018, 0xFFD9 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0xFFFA, 0x0003 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0025, 0x0037 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x004F, 0x0066, 0x0029 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x00A6, 0x00AD, 0x0006 } }, + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x010D, 0x015A, 0xFF4C } }, + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x019F, 0x0245, 0xFE35 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s") +static CutsceneCameraPoint sWarpInCameraPoints[] = { + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x019F, 0x0245, 0xFE35 } }, + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x010D, 0x015A, 0xFF4C } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x00A6, 0x00AD, 0x0006 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x004F, 0x0066, 0x0029 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0025, 0x0037 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0xFFFA, 0x0003 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0001, 0x0018, 0xFFD9 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x001C, 0x0032, 0xFFFF } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0017, 0x0024 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0x0000, 0x0000 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s") +static Color_RGB8 sSparkleEnvColors[] = { + { 0, 200, 0 }, { 255, 50, 0 }, { 0, 150, 255 }, { 255, 150, 0 }, // only this one is used + { 0, 255, 255 }, { 200, 255, 0 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s") +static CutsceneCameraPoint sSparklesCameraPoints[] = { + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x0000, 0xFFE9 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD3, 0x0000, 0x000A } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE8, 0x0001, 0x0027 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0015, 0x0000, 0x002B } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002F, 0x0005, 0x000E } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0031, 0x0005, 0xFFF5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0020, 0x0005, 0xFFDA } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF5, 0x0005, 0xFFD1 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x0006, 0xFFEA } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD5, 0x0009, 0x000D } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE9, 0x0009, 0x0027 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0014, 0x000B, 0x0029 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002D, 0x000B, 0x000F } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002E, 0x000B, 0xFFF0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001E, 0x000B, 0xFFDA } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFA, 0x000E, 0xFFD3 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDA, 0x000E, 0xFFEB } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x0010, 0x0008 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE9, 0x0010, 0x0024 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0011, 0x0010, 0x0028 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002C, 0x0010, 0x000D } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002C, 0x0012, 0xFFF5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001F, 0x0011, 0xFFDE } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFB, 0x0014, 0xFFD5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDD, 0x0014, 0xFFEC } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDA, 0x0017, 0x0008 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE8, 0x0014, 0x001F } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x000C, 0x0018, 0x0026 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0027, 0x0018, 0x000D } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0027, 0x001B, 0xFFF6 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001C, 0x001A, 0xFFE2 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFA, 0x000E, 0xFFD4 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD9, 0x001B, 0xFFEF } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x001B, 0x000A } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE6, 0x001B, 0x0022 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x000F, 0x001F, 0x002C } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0032, 0x0020, 0x0009 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0030, 0x0021, 0xFFF0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001C, 0x0025, 0xFFD9 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFA, 0x0028, 0xFFD4 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD8, 0x002B, 0xFFF5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x002B, 0x0006 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDF, 0x002B, 0x0019 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x000E, 0x002E, 0x002C } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0032, 0x002E, 0x0003 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002A, 0x0030, 0xFFE7 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, + { CS_CMD_STOP, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, + { CS_CMD_STOP, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s") +static s16 D_8098CF80; +static s16 sRainScale; +static s16 D_8098CF84; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s") +extern Mtx D_01000000; // perspective mtx -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s") +extern Gfx D_06000080[]; // rain DL +extern Gfx D_06000DE0[]; // rocks DL +extern Gfx D_06007440[]; // DoT DL left +extern Gfx D_06007578[]; // DoT DL right +extern Gfx D_06008390[]; // light plane DL -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s") +void DemoKankyo_SetupAction(DemoKankyo* this, DemoKankyoActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s") +void DemoKankyo_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s16 i; + s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjIds[this->actor.params]); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s") + osSyncPrintf("bank_ID = %d\n", objBankIndex); + if (objBankIndex < 0) { + __assert("0", "../z_demo_kankyo.c", 521); + } else { + this->objBankIndex = objBankIndex; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s") + switch (this->actor.params) { + case DEMOKANKYO_BLUE_RAIN: + case DEMOKANKYO_BLUE_RAIN_2: + switch (globalCtx->sceneNum) { + case SCENE_HIRAL_DEMO: + globalCtx->roomCtx.curRoom.segment = NULL; + D_8098CF80 = 10; + sRainScale = 8; + break; + case SCENE_TOKINOMA: + D_8098CF80 = 14; + sRainScale = 8; + break; + case SCENE_SPOT00: + D_8098CF80 = 1; + sRainScale = 5; + break; + default: + Actor_Kill(&this->actor); + break; + } + break; + case DEMOKANKYO_ROCK_1: + case DEMOKANKYO_ROCK_2: + case DEMOKANKYO_ROCK_3: + case DEMOKANKYO_ROCK_4: + case DEMOKANKYO_ROCK_5: + globalCtx->roomCtx.curRoom.segment = NULL; + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = Rand_ZeroOne() * 0.5f + 0.5f; + this->unk_150[0].unk_0.x = Rand_ZeroOne() * 3.0f + 1.0f; + this->unk_150[0].unk_0.y = Rand_ZeroOne() * 3.0f + 1.0f; + this->unk_150[0].unk_0.z = Rand_ZeroOne() * 3.0f + 1.0f; + break; + case DEMOKANKYO_CLOUDS: + for (i = 0; i < 30; i++) { + this->unk_150[i].unk_20 = Rand_ZeroOne() * 65535.0f; + this->unk_150[i].unk_18 = Rand_ZeroOne() * 100.0f + 60.0f; + } + break; + case DEMOKANKYO_DOOR_OF_TIME: + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + this->unk_150[0].unk_18 = 0.0f; + if (!(gSaveContext.eventChkInf[4] & 0x800)) { + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_TOKI, + this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, + 0, 0x0000); + } else { + globalCtx->unk_11D30[1] = 0xFF; + Actor_Kill(&this->actor); + } + break; + case DEMOKANKYO_LIGHT_PLANE: + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + this->unk_150[0].unk_18 = 0.0f; + break; + case DEMOKANKYO_WARP_OUT: + case DEMOKANKYO_WARP_IN: + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_ITEMACTION); + this->actor.flags |= 0x2000000; + this->actor.room = -1; + this->warpTimer = 35; + this->sparkleCounter = 0; + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + Audio_PlaySoundGeneral(NA_SE_EV_SARIA_MELODY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + break; + case DEMOKANKYO_SPARKLES: + this->warpTimer = 35; + this->sparkleCounter = 0; + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + break; + default: + break; + } + for (i = 0; i < 30; i++) { + this->unk_150[i].unk_22 = 0; + } + DemoKankyo_SetupAction(this, DemoKankyo_SetupType); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s") +void DemoKankyo_Destroy(Actor* thisx, GlobalContext* globalCtx) { + if (thisx) {} +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s") +void DemoKankyo_SetupType(DemoKankyo* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s") + if (this->actor.objBankIndex == this->objBankIndex) { + switch (this->actor.params) { + case DEMOKANKYO_ROCK_1: + case DEMOKANKYO_ROCK_2: + case DEMOKANKYO_ROCK_3: + case DEMOKANKYO_ROCK_4: + case DEMOKANKYO_ROCK_5: + DemoKankyo_SetupAction(this, DemoKankyo_UpdateRock); + break; + case DEMOKANKYO_CLOUDS: + DemoKankyo_SetupAction(this, DemoKankyo_UpdateClouds); + break; + case DEMOKANKYO_DOOR_OF_TIME: + if (Flags_GetEnv(globalCtx, 2)) { + DemoKankyo_SetupAction(this, DemoKankyo_UpdateDoorOfTime); + } + break; + case DEMOKANKYO_WARP_OUT: + globalCtx->envCtx.unk_E2[0] = 0xFF; + globalCtx->envCtx.unk_E2[1] = 0xFF; + globalCtx->envCtx.unk_E2[2] = 0xFF; + globalCtx->envCtx.unk_E1 = 0; + if (this->warpTimer < 21 && this->warpTimer >= 15) { + temp = (this->warpTimer - 15.0f) / 5.0f; + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[3] = 255 - 255 * temp; + } + if (this->warpTimer < 15 && this->warpTimer >= 4) { + temp = (this->warpTimer - 4.0f) / 10.0f; + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[3] = 255 * temp; + } + if (this->warpTimer == 15) { + player->actor.draw = NULL; + } + if ((u32)this->warpTimer != 0) { + this->warpTimer--; + } + if (this->warpTimer == 1) { + if (globalCtx->sceneNum == SCENE_TOKINOMA) { + D_8098CF84 = 25; + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpInToTCS; + } else { + globalCtx->csCtx.segment = gAdultWarpInToTCS; + } + } else { + D_8098CF84 = 32; + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpInCS; + } else { + globalCtx->csCtx.segment = gAdultWarpInCS; + } + } + if (func_800C0CB8(globalCtx) != 0) { + gSaveContext.cutsceneTrigger = 1; + } + DemoKankyo_SetupAction(this, DemoKankyo_DoNothing); + } + break; + case DEMOKANKYO_WARP_IN: + if (globalCtx->sceneNum == SCENE_TOKINOMA) { + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpOutToTCS; + } else { + globalCtx->csCtx.segment = gAdultWarpOutToTCS; + } + } else { + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpOutCS; + } else { + globalCtx->csCtx.segment = gAdultWarpOutCS; + } + } + gSaveContext.cutsceneTrigger = 1; + DemoKankyo_SetupAction(this, DemoKankyo_DoNothing2); + break; + case DEMOKANKYO_BLUE_RAIN: + case DEMOKANKYO_SPARKLES: + break; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s") +void DemoKankyo_DoNothing(DemoKankyo* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s") +void DemoKankyo_DoNothing2(DemoKankyo* this, GlobalContext* globalCtx) { + DemoKankyo_SetupAction(this, DemoKankyo_DoNothing); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s") +void DemoKankyo_SetRockPos(DemoKankyo* this, GlobalContext* globalCtx, s32 params) { + Vec3f startPos; + Vec3f endPos; + CsCmdActorAction* csAction = globalCtx->csCtx.npcActions[params]; + f32 temp_f0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s") + startPos.x = csAction->startPos.x; + startPos.y = csAction->startPos.y; + startPos.z = csAction->startPos.z; + endPos.x = csAction->endPos.x; + endPos.y = csAction->endPos.y; + endPos.z = csAction->endPos.z; + temp_f0 = func_8006F93C(csAction->endFrame, csAction->startFrame, globalCtx->csCtx.frames); + this->actor.world.pos.x = ((endPos.x - startPos.x) * temp_f0) + startPos.x; + this->actor.world.pos.y = ((endPos.y - startPos.y) * temp_f0) + startPos.y; + this->actor.world.pos.z = ((endPos.z - startPos.z) * temp_f0) + startPos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s") +void DemoKankyo_UpdateRock(DemoKankyo* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->actor.params - 2] != NULL) { + DemoKankyo_SetRockPos(this, globalCtx, this->actor.params - 2); + } + this->unk_150[0].unk_C.x += this->unk_150[0].unk_0.x; + this->unk_150[0].unk_C.y += this->unk_150[0].unk_0.y; + this->unk_150[0].unk_C.z += this->unk_150[0].unk_0.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s") +void DemoKankyo_UpdateClouds(DemoKankyo* this, GlobalContext* globalCtx) { + u8 i; + + for (i = 0; i < 30; i++) { + this->unk_150[i].unk_20 += (s16)this->unk_150[i].unk_18; + } +} + +void DemoKankyo_UpdateDoorOfTime(DemoKankyo* this, GlobalContext* globalCtx) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG); + this->unk_150[0].unk_18 += 1.0f; + if (this->unk_150[0].unk_18 >= 102.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_STONEDOOR_STOP); + gSaveContext.eventChkInf[4] |= 0x800; + Actor_Kill(this->actor.child); + DemoKankyo_SetupAction(this, DemoKankyo_KillDoorOfTimeCollision); + } +} + +void DemoKankyo_KillDoorOfTimeCollision(DemoKankyo* this, GlobalContext* globalCtx) { + Actor_Kill(this->actor.child); +} + +void DemoKankyo_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + this->actionFunc(this, globalCtx); +} + +void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + + if (this->actor.objBankIndex == this->objBankIndex) { + switch (this->actor.params) { + case DEMOKANKYO_BLUE_RAIN: + case DEMOKANKYO_BLUE_RAIN_2: + if (globalCtx->sceneNum == SCENE_TOKINOMA) { + if (!Flags_GetEnv(globalCtx, 1)) { + break; + } else if (!func_8002E12C(&this->actor, 300.0f, 0x7530)) { + break; + } else { + if (LINK_IS_CHILD) { + if (globalCtx->csCtx.frames < 170 || globalCtx->csCtx.state == 0) { + break; + } + } else { + if (globalCtx->csCtx.frames < 120 || globalCtx->csCtx.state == 0) { + break; + } + } + } + } + DemoKankyo_DrawRain(thisx, globalCtx); + break; + case DEMOKANKYO_ROCK_1: + case DEMOKANKYO_ROCK_2: + case DEMOKANKYO_ROCK_3: + case DEMOKANKYO_ROCK_4: + case DEMOKANKYO_ROCK_5: + DemoKankyo_DrawRock(thisx, globalCtx); + break; + case DEMOKANKYO_CLOUDS: + DemoKankyo_DrawClouds(thisx, globalCtx); + break; + case DEMOKANKYO_DOOR_OF_TIME: + DemoKankyo_DrawDoorOfTime(thisx, globalCtx); + break; + case DEMOKANKYO_LIGHT_PLANE: + DemoKankyo_DrawLightPlane(thisx, globalCtx); + break; + case DEMOKANKYO_WARP_OUT: + case DEMOKANKYO_WARP_IN: + DemoKankyo_DrawWarpSparkles(thisx, globalCtx); + break; + case DEMOKANKYO_SPARKLES: + DemoKankyo_DrawSparkles(thisx, globalCtx); + break; + } + } + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { + this->actor.objBankIndex = this->objBankIndex; + } +} + +// transform relating to blue rain +void func_80989B54(Actor* thisx, GlobalContext* globalCtx, s16 i) { + DemoKankyo* this = THIS; + + switch (globalCtx->sceneNum) { + case SCENE_HIRAL_DEMO: + this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 500.0f; + this->unk_150[i].unk_0.y = 500.0f; + this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 500.0f; + break; + case SCENE_TOKINOMA: + this->unk_150[i].unk_C.x = 0.0f; + this->unk_150[i].unk_C.y = 0.0f; + this->unk_150[i].unk_C.z = 0.0f; + this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 180.0f; + this->unk_150[i].unk_0.y = 10.0f; + this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 180.0f; + break; + case SCENE_SPOT00: + this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 600.0f; + this->unk_150[i].unk_0.y = -500.0f; + this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 600.0f; + break; + } + this->unk_150[i].unk_18 = Rand_ZeroOne() * (D_8098CF80 * 4.0f) + D_8098CF80; +} + +void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + f32 temp_f12_2; + s16 i; + f32 dx; + f32 dy; + f32 dz; + f32 norm; + f32 translateX; + f32 translateY; + f32 translateZ; + s16 j; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1186); + + for (i = 0; i < 30; i++) { + s32 pad[2]; + + dx = globalCtx->view.lookAt.x - globalCtx->view.eye.x; + dy = globalCtx->view.lookAt.y - globalCtx->view.eye.y; + dz = globalCtx->view.lookAt.z - globalCtx->view.eye.z; + norm = sqrtf(SQ(dx) + SQ(dy) + SQ(dz)); + + if (globalCtx->sceneNum != SCENE_TOKINOMA) { + this->unk_150[i].unk_C.x = globalCtx->view.eye.x + (dx / norm) * 350.0f; + this->unk_150[i].unk_C.y = globalCtx->view.eye.y + (dy / norm) * 80.0f; + this->unk_150[i].unk_C.z = globalCtx->view.eye.z + (dz / norm) * 350.0f; + } + + switch (this->unk_150[i].unk_22) { + case 0: + func_80989B54(thisx, globalCtx, i); + if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + this->unk_150[i].unk_0.y = Rand_ZeroOne() * 500.0f; + } else { + this->unk_150[i].unk_0.y = Rand_ZeroOne() * -500.0f; + } + this->unk_150[i].unk_22++; + break; + case 1: + temp_f12_2 = globalCtx->view.eye.y + (dy / norm) * 150.0f; + if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + this->unk_150[i].unk_0.y -= this->unk_150[i].unk_18; + } else { + this->unk_150[i].unk_0.y += this->unk_150[i].unk_18; + } + if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + if (this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y < temp_f12_2 - 300.0f) { + this->unk_150[i].unk_22++; + } + } else if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field + if (temp_f12_2 + 300.0f < this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y) { + this->unk_150[i].unk_22++; + } + } else { + if (1000.0f < this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y) { + this->unk_150[i].unk_22++; + } + } + break; + case 2: + func_80989B54(thisx, globalCtx, i); + this->unk_150[i].unk_22--; + break; + } + + Matrix_Translate(this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x, + this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y, + this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z, MTXMODE_NEW); + if (gSaveContext.entranceIndex != 0x00A0) { // Cutscene Map + Matrix_RotateX(M_PI, MTXMODE_APPLY); + } + + gDPPipeSync(POLY_XLU_DISP++); + if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 255); + } else { + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 150, 255, 255); + } + + Matrix_Scale(sRainScale * 0.001f, sRainScale * 0.001f, sRainScale * 0.001f, MTXMODE_APPLY); + + for (j = 0; j < 5; j++) { + s32 pad1; + + if (globalCtx->sceneNum != SCENE_TOKINOMA) { + if (this->unk_150[i].unk_0.x >= 0.0f) { + translateX = -j * 1500.0f; + } else { + translateX = j * 1500.0f; + } + if (this->unk_150[i].unk_0.z >= 0.0f) { + translateZ = -j * 1500.0f; + } else { + translateZ = j * 1500.0f; + } + if (j % 2 != 0) { + translateY = j * 4000.0f; + } else { + translateY = -j * 4000.0f; + } + } else { + translateX = 0.0f; + translateY = j * 10.0f; + translateZ = 0.0f; + } + + Matrix_Translate(translateX, translateY, translateZ, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1344), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); + gSPDisplayList(POLY_XLU_DISP++, D_06000080); + } + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1358); +} + +void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1376); + + func_80093D18(globalCtx->state.gfxCtx); + Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); + Matrix_RotateX(DEG_TO_RAD(this->unk_150[0].unk_C.x), MTXMODE_APPLY); + Matrix_RotateY(DEG_TO_RAD(this->unk_150[0].unk_C.y), MTXMODE_APPLY); + Matrix_RotateZ(DEG_TO_RAD(this->unk_150[0].unk_C.z), MTXMODE_APPLY); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255); + gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1404), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06000DE0); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1409); +} + +void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s16 i; + s32 pad; + f32 dx; + f32 dy; + f32 dz; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1425); + + for (i = 0; i < 30; i++) { + dx = -(Math_SinS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f); + dy = Math_CosS(this->unk_150[i].unk_20 - 0x8000) * 5.0f + 1200.0f; + dz = (Math_CosS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f); + + Matrix_Translate(globalCtx->view.eye.x + dx, globalCtx->view.eye.y + dy + ((i - 12.0f) * 300.0f), + globalCtx->view.eye.z + dz, MTXMODE_NEW); + Matrix_Scale(125.0f, 60.0f, 125.0f, MTXMODE_APPLY); + + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 210, 210, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); + gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1461), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex)); + + func_80094C50(globalCtx->state.gfxCtx); + + gSPMatrix(POLY_XLU_DISP++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gEffDustDL); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1474); +} + +void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1487); + + func_80093D18(globalCtx->state.gfxCtx); + Matrix_Translate(-this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1492), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06007440); + Matrix_Translate(this->unk_150[0].unk_18 + this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1497), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06007578); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1501); +} + +void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1514); + + if (globalCtx->csCtx.state == 0 || gSaveContext.sceneSetupIndex >= 4) { + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames & 0x7F, 64, 32)); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1529), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06008390); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1534); +} + +void DemoKankyo_Vec3fCopy(Vec3f* src, Vec3f* dst) { + dst->x = src->x; + dst->y = src->y; + dst->z = src->z; +} + +Vec3f* DemoKankyo_Vec3fAddVecSph(Vec3f* dst, Vec3f* vec, VecSph* sph) { + Vec3f result; + Vec3f sphVec; + + OLib_VecSphGeoToVec3f(&sphVec, sph); + result.x = vec->x + sphVec.x; + result.y = vec->y + sphVec.y; + result.z = vec->z + sphVec.z; + *dst = result; + return dst; +} + +void DemoKankyo_Vec3fAddPosRot(PosRot* posRot, Vec3f* vec, Vec3f* dst) { + VecSph sph; + Vec3f vecCopy; + + DemoKankyo_Vec3fCopy(vec, &vecCopy); + OLib_Vec3fToVecSphGeo(&sph, &vecCopy); + sph.yaw += posRot->rot.y; + DemoKankyo_Vec3fAddVecSph(dst, &posRot->pos, &sph); +} + +void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) { + static f32 sWarpRoll; + static f32 sWarpFoV; + // the following 2 vars are unused + static u32 D_8098CF90; + static u32 D_8098CF94; + static Vec3f D_8098CF98; + + s16 i; + f32 temp_f22; + DemoKankyo* this = THIS; + Gfx* disp; + Player* player = PLAYER; + Vec3f camPos; + f32 translateX; + f32 translateY; + f32 translateZ; + PosRot posRot; + u8 linkAge = gSaveContext.linkAge; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1824); + + if (this->sparkleCounter < 30) { + this->sparkleCounter += 2; + } + for (i = this->sparkleCounter - 1; i >= 0; i--) { + temp_f22 = 1.0f - (i / (f32)this->sparkleCounter); + + switch (this->unk_150[i].unk_22) { + case 0: + this->unk_150[i].unk_20 = 0; + this->unk_150[i].unk_1C = 0; + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_23 = 0; + this->unk_150[i].unk_22++; + case 1: + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + if (func_800BB2B4(&camPos, &sWarpRoll, &sWarpFoV, sWarpOutCameraPoints, &this->unk_150[i].unk_20, + &this->unk_150[i].unk_1C) != 0) { + this->unk_150[i].unk_22++; + } + if (globalCtx->sceneNum == SCENE_TOKINOMA && globalCtx->csCtx.frames == 25) { + this->unk_150[i].unk_22++; + } + } else { + Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP_OUT - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + if (func_800BB2B4(&camPos, &sWarpRoll, &sWarpFoV, sWarpInCameraPoints, &this->unk_150[i].unk_20, + &this->unk_150[i].unk_1C) != 0) { + this->unk_150[i].unk_22++; + } + if (D_8098CF84 < globalCtx->csCtx.frames && this->actor.params == DEMOKANKYO_WARP_OUT) { + this->unk_150[i].unk_22++; + } + } + Actor_GetWorld(&posRot, &player->actor); + DemoKankyo_Vec3fAddPosRot(&posRot, &camPos, &D_8098CF98); + break; + case 2: + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + if (i == 0) { + func_800776E4(globalCtx); + this->unk_150[i].unk_22++; + } + } else if (i + 1 == this->sparkleCounter && globalCtx->csCtx.state == 0) { + func_80088AF0(globalCtx); + Actor_Kill(&this->actor); + } + break; + } + + this->unk_150[i].unk_C.x = D_8098CF98.x; + this->unk_150[i].unk_C.y = D_8098CF98.y; + this->unk_150[i].unk_C.z = D_8098CF98.z; + + switch (this->unk_150[i].unk_23) { + case 0: + this->unk_150[i].unk_18 = Rand_ZeroOne(); + this->unk_150[i].unk_23++; + case 1: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 1.0f, 0.5f, 0.4f, 0.2f); + if (this->unk_150[i].unk_18 >= 1.0f) { + this->unk_150[i].unk_23 = 2; + } + break; + case 2: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 0.0f, 0.5f, 0.3f, 0.2f); + if (this->unk_150[i].unk_18 <= 0.0f) { + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_18 = 0.0f; + this->unk_150[i].unk_23 = 1; + } + break; + } + + translateX = this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x; + translateY = this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y; + translateZ = this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z; + + if (this->unk_150[i].unk_22 < 2) { + disp = (u32)gEffFlash1DL; + if (linkAge != 0) { + Matrix_Translate(translateX, translateY, translateZ, MTXMODE_NEW); + } else { + if (translateY) {} + Matrix_Translate(translateX, translateY + 15.0f, translateZ, MTXMODE_NEW); + } + Matrix_Scale(this->unk_150[i].unk_18 * (0.018f * temp_f22), this->unk_150[i].unk_18 * (0.018f * temp_f22), + this->unk_150[i].unk_18 * (0.018f * temp_f22), MTXMODE_APPLY); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, 255); + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + gDPSetEnvColor(POLY_XLU_DISP++, sWarpSparkleEnvColors[globalCtx->msgCtx.unk_E3EC].r, + sWarpSparkleEnvColors[globalCtx->msgCtx.unk_E3EC].g, + sWarpSparkleEnvColors[globalCtx->msgCtx.unk_E3EC].b, 255); + } else { + s8 respawnData = gSaveContext.respawn[1].data; + gDPSetEnvColor(POLY_XLU_DISP++, sWarpSparkleEnvColors[respawnData].r, + sWarpSparkleEnvColors[respawnData].g, sWarpSparkleEnvColors[respawnData].b, 255); + } + func_80093D84(globalCtx->state.gfxCtx); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2011), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, disp); + this->unk_150[i].unk_24 += 0x190; + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2019); +} + +void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) { + static f32 sSparklesRoll; + static f32 sSparklesFoV; + // the following 3 vars are unused + static u32 D_8098CFAC; + static u32 D_8098CFB0; + static u32 D_8098CFB4; + static Vec3f D_8098CFB8; + + DemoKankyo* this = THIS; + f32 translateX; + f32 translateY; + f32 translateZ; + Vec3f camPos; + f32 temp_f20; + f32 scale; + s16 i; + PosRot posRot; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2434); + + if (this->sparkleCounter < 20) { + this->sparkleCounter++; + } + + for (i = this->sparkleCounter - 1; i >= 0; i--) { + temp_f20 = 1.0f - (i / (f32)this->sparkleCounter); + + switch (this->unk_150[i].unk_22) { + case 0: + this->unk_150[i].unk_20 = 0; + this->unk_150[i].unk_1C = 0; + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_23 = 0; + this->unk_150[i].unk_22++; + case 1: + if (func_800BB2B4(&camPos, &sSparklesRoll, &sSparklesFoV, sSparklesCameraPoints, + &this->unk_150[i].unk_20, &this->unk_150[i].unk_1C) != 0) { + this->unk_150[i].unk_22++; + } + Actor_GetWorld(&posRot, &this->actor); + DemoKankyo_Vec3fAddPosRot(&posRot, &camPos, &D_8098CFB8); + break; + case 2: + if (i + 1 == this->sparkleCounter && globalCtx->csCtx.state == 0) { + Actor_Kill(&this->actor); + } + break; + } + + this->unk_150[i].unk_C.x = D_8098CFB8.x; + this->unk_150[i].unk_C.y = D_8098CFB8.y; + this->unk_150[i].unk_C.z = D_8098CFB8.z; + + switch (this->unk_150[i].unk_23) { + case 0: + this->unk_150[i].unk_18 = Rand_ZeroOne(); + this->unk_150[i].unk_23++; + case 1: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 1.0f, 0.5f, 0.4f, 0.2f); + if (1.0f <= this->unk_150[i].unk_18) { + this->unk_150[i].unk_23 = 2; + } + break; + case 2: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 0.0f, 0.5f, 0.3f, 0.2f); + if (this->unk_150[i].unk_18 <= 0.0f) { + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_18 = 0.0f; + this->unk_150[i].unk_23 = 1; + } + break; + } + + translateX = this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x; + translateY = this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y; + translateZ = this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z; + + if (this->unk_150[i].unk_22 < 2) { + Matrix_Translate(translateX, translateY, translateZ, MTXMODE_NEW); + scale = this->unk_150[i].unk_18 * (0.02f * temp_f20); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, sSparkleEnvColors[3].r, sSparkleEnvColors[3].g, sSparkleEnvColors[3].b, + 255); + func_80093D84(globalCtx->state.gfxCtx); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2572), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); + this->unk_150[i].unk_24 += 0x190; + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2579); +} diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h index f16653a37f..97eaea4a3b 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -6,9 +6,47 @@ struct DemoKankyo; +typedef void (*DemoKankyoActionFunc)(struct DemoKankyo*, GlobalContext*); + +typedef enum { + /* 0x00 */ DEMOKANKYO_BLUE_RAIN, + /* 0x01 */ DEMOKANKYO_BLUE_RAIN_2, + /* 0x02 */ DEMOKANKYO_ROCK_1, + /* 0x03 */ DEMOKANKYO_ROCK_2, + /* 0x04 */ DEMOKANKYO_ROCK_3, + /* 0x05 */ DEMOKANKYO_ROCK_4, + /* 0x06 */ DEMOKANKYO_ROCK_5, + /* 0x07 */ DEMOKANKYO_CLOUDS, + /* 0x08 */ DEMOKANKYO_8, // These unnamed types are removed types that would have used object_gi_melody + /* 0x09 */ DEMOKANKYO_9, + /* 0x0A */ DEMOKANKYO_A, + /* 0x0B */ DEMOKANKYO_B, + /* 0x0C */ DEMOKANKYO_C, + /* 0x0D */ DEMOKANKYO_DOOR_OF_TIME, + /* 0x0E */ DEMOKANKYO_LIGHT_PLANE, + /* 0x0F */ DEMOKANKYO_WARP_OUT, + /* 0x10 */ DEMOKANKYO_WARP_IN, + /* 0x11 */ DEMOKANKYO_SPARKLES +} DemoKankyoType; + +typedef struct { + /* 0x00 */ Vec3f unk_0; + /* 0x0C */ Vec3f unk_C; + /* 0x18 */ f32 unk_18; // For Door of Time, this is the amount to translate it by used for when it's opening + /* 0x1C */ f32 unk_1C; + /* 0x20 */ s16 unk_20; + /* 0x22 */ u8 unk_22; // mode ? + /* 0x23 */ u8 unk_23; + /* 0x24 */ s16 unk_24; +} DemoKankyoUnk150; // size = 0x28 + typedef struct DemoKankyo { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x4B8]; + /* 0x014C */ u8 objBankIndex; + /* 0x014D */ u8 sparkleCounter; + /* 0x014E */ u8 warpTimer; + /* 0x0150 */ DemoKankyoUnk150 unk_150[30]; + /* 0x0600 */ DemoKankyoActionFunc actionFunc; } DemoKankyo; // size = 0x0604 extern const ActorInit Demo_Kankyo_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c new file mode 100644 index 0000000000..88660dec8e --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpInCS[] = { + CS_BEGIN_CUTSCENE(2, 164), + CS_CAM_POS_PLAYER_LIST(0, 135), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 79, 59, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 78, 60, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 32, 78, 60, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 79, 59, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 164), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 50, 23, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 48, 22, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 11, 48, 22, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 57, 101, 21, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x0000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c new file mode 100644 index 0000000000..08915b5c82 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c @@ -0,0 +1,31 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpOutCS[] = { + CS_BEGIN_CUTSCENE(5, 1167), + CS_CAM_POS_PLAYER_LIST(0, 1138), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0x20BA), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA1BC), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5E1), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5CB), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5EB), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0x20BA), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA1BC), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5E1), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1167), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 55, 99, 31, 0x20BA), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 55, 99, 31, 0xA1BC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 10, 60.324859619140625f, 55, 99, 31, 0xA5E1), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.324859619140625f, 17, 59, 31, 0xA5CB), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA5EB), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324859619140625f, 17, 59, 31, 0x20BA), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA1BC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA5E1), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 97, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c new file mode 100644 index 0000000000..c3f73c91d0 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpInToTCS[] = { + CS_BEGIN_CUTSCENE(2, 118), + CS_CAM_POS_PLAYER_LIST(0, 89), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 71.32476043701172f, 53, 53, 40, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x0047), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 118), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.52477264404297f, 11, 29, 10, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.39991760253906f, 11, 29, 10, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 11, 29, 10, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 29, 71, 25, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x0047), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c new file mode 100644 index 0000000000..ad72e76d85 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpOutToTCS[] = { + CS_BEGIN_CUTSCENE(5, 1120), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_CAM_POS_PLAYER_LIST(0, 1091), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x29D0), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x29D0), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c new file mode 100644 index 0000000000..a86b93dd22 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c @@ -0,0 +1,27 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpInCS[] = { + CS_BEGIN_CUTSCENE(2, 1164), + CS_CAM_POS_PLAYER_LIST(0, 1135), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 68, 59, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 32, 68, 60, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 69, 59, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0xB46C), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x05BC), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1164), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 12, 40, 22, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 38, 22, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 11, 39, 22, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 57, 86, 21, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.32485580444336f, 57, 86, 21, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0xB46C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0x05BC), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c new file mode 100644 index 0000000000..e0d467d43b --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c @@ -0,0 +1,31 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpOutCS[] = { + CS_BEGIN_CUTSCENE(5, 1167), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_CAM_POS_PLAYER_LIST(0, 1138), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xA8A5), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xA3D9), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xF3A5), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5D5), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5E7), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5EC), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xBCA5), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xEEC0), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1167), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 54, 79, 31, 0xA8A5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 54, 80, 31, 0xA3D9), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 10, 60.324859619140625f, 54, 79, 31, 0xF3A5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32486343383789f, 15, 42, 30, 0xA5D5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xA5E7), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.32486343383789f, 15, 42, 30, 0xA5EC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xBCA5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xEEC0), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c new file mode 100644 index 0000000000..549d8a77a5 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c @@ -0,0 +1,27 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpInToTCS[] = { + CS_BEGIN_CUTSCENE(2, 1118), + CS_CAM_POS_PLAYER_LIST(0, 1089), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 71.32476043701172f, 53, 53, 40, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1118), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.52477264404297f, 11, 29, 10, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.39991760253906f, 11, 29, 10, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 11, 29, 10, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 29, 58, 25, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 70.59991455078125f, 29, 58, 25, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x0000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c new file mode 100644 index 0000000000..d68e8139d8 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpOutToTCS[] = { + CS_BEGIN_CUTSCENE(5, 1120), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_CAM_POS_PLAYER_LIST(0, 1091), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1F1C), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1F8C), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1FFC), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x206C), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x20DC), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x1F1C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x1F8C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324867248535156f, 24, 52, 29, 0x1FFC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x206C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x20DC), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on