diff --git a/asm/non_matchings/code/code_80102FA0/func_80102FA0.s b/asm/guMtxL2F.s similarity index 82% rename from asm/non_matchings/code/code_80102FA0/func_80102FA0.s rename to asm/guMtxL2F.s index f346419598..68c4ad253d 100644 --- a/asm/non_matchings/code/code_80102FA0/func_80102FA0.s +++ b/asm/guMtxL2F.s @@ -1,4 +1,15 @@ -glabel func_80102FA0 +.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 .text + +.balign 16 + +glabel guMtxL2F /* B7A140 80102FA0 3C013780 */ li $at, 0x37800000 # 0.000000 /* B7A144 80102FA4 44810000 */ mtc1 $at, $f0 /* B7A148 80102FA8 3C19FFFF */ li $t9, 0xFFFF0000 # 0.000000 @@ -25,4 +36,4 @@ glabel func_80102FA0 /* B7A198 80102FF8 14B8FFED */ bne $a1, $t8, .L80102FB0 /* B7A19C 80102FFC E492FFFC */ swc1 $f18, -4($a0) /* B7A1A0 80103000 03E00008 */ jr $ra -/* B7A1A4 80103004 00000000 */ nop \ No newline at end of file +/* B7A1A4 80103004 00000000 */ nop diff --git a/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s b/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s index 24f59c8d88..8f9e14ee80 100644 --- a/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s +++ b/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s @@ -863,7 +863,7 @@ glabel L800EB920 /* B62B00 800EB960 1000FDE4 */ b .L800EB0F4 /* B62B04 800EB964 00000000 */ nop glabel L800EB968 -/* B62B08 800EB968 0C0399F0 */ jal func_800E67C0 +/* B62B08 800EB968 0C0399F0 */ jal Audio_NextRandom /* B62B0C 800EB96C 00000000 */ nop /* B62B10 800EB970 8FA90060 */ lw $t1, 0x60($sp) /* B62B14 800EB974 8FAB0060 */ lw $t3, 0x60($sp) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E67C0.s b/asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s similarity index 98% rename from asm/non_matchings/code/code_800E11F0/func_800E67C0.s rename to asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s index 90bbc281d6..6f89f1b81c 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E67C0.s +++ b/asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s @@ -1,4 +1,4 @@ -glabel func_800E67C0 +glabel Audio_NextRandom /* B5D960 800E67C0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5D964 800E67C4 AFBF0014 */ sw $ra, 0x14($sp) /* B5D968 800E67C8 0C001BA8 */ jal osGetCount diff --git a/asm/non_matchings/code/code_800EC960/func_800EE5EC.s b/asm/non_matchings/code/code_800EC960/func_800EE5EC.s index df46cd0b1f..5a954530e3 100644 --- a/asm/non_matchings/code/code_800EC960/func_800EE5EC.s +++ b/asm/non_matchings/code/code_800EC960/func_800EE5EC.s @@ -11,7 +11,7 @@ glabel func_800EE5EC /* B657B0 800EE610 10000034 */ b .L800EE6E4 /* B657B4 800EE614 24020001 */ li $v0, 1 .L800EE618: -/* B657B8 800EE618 0C0399F0 */ jal func_800E67C0 +/* B657B8 800EE618 0C0399F0 */ jal Audio_NextRandom /* B657BC 800EE61C 00000000 */ nop /* B657C0 800EE620 24080005 */ li $t0, 5 /* B657C4 800EE624 0048001B */ divu $zero, $v0, $t0 diff --git a/asm/non_matchings/code/code_800EC960/func_800EEA50.s b/asm/non_matchings/code/code_800EC960/func_800EEA50.s index 36b68da95d..adf4fa67af 100644 --- a/asm/non_matchings/code/code_800EC960/func_800EEA50.s +++ b/asm/non_matchings/code/code_800EC960/func_800EEA50.s @@ -923,8 +923,8 @@ glabel L800EEEB4 /* B661AC 800EF00C 31180002 */ andi $t8, $t0, 2 /* B661B0 800EF010 0018C843 */ sra $t9, $t8, 1 /* B661B4 800EF014 310A0001 */ andi $t2, $t0, 1 -/* B661B8 800EF018 3C158013 */ lui $s5, %hi(D_801333A8) # $s5, 0x8013 -/* B661BC 800EF01C 26B533A8 */ addiu $s5, %lo(D_801333A8) # addiu $s5, $s5, 0x33a8 +/* B661B8 800EF018 3C158013 */ lui $s5, %hi(gSoundBanks) # $s5, 0x8013 +/* B661BC 800EF01C 26B533A8 */ addiu $s5, %lo(gSoundBanks) # addiu $s5, $s5, 0x33a8 /* B661C0 800EF020 001E6080 */ sll $t4, $fp, 2 /* B661C4 800EF024 02AC9021 */ addu $s2, $s5, $t4 /* B661C8 800EF028 8E4D0000 */ lw $t5, ($s2) @@ -1176,9 +1176,9 @@ glabel L800EF3F0 /* B66594 800EF3F4 4481B000 */ mtc1 $at, $f22 /* B66598 800EF3F8 3C018015 */ lui $at, %hi(D_8014A4C0) /* B6659C 800EF3FC 3C168017 */ lui $s6, %hi(D_8016E1B8) # $s6, 0x8017 -/* B665A0 800EF400 3C158013 */ lui $s5, %hi(D_801333A8) # $s5, 0x8013 +/* B665A0 800EF400 3C158013 */ lui $s5, %hi(gSoundBanks) # $s5, 0x8013 /* B665A4 800EF404 0000F025 */ move $fp, $zero -/* B665A8 800EF408 26B533A8 */ addiu $s5, %lo(D_801333A8) # addiu $s5, $s5, 0x33a8 +/* B665A8 800EF408 26B533A8 */ addiu $s5, %lo(gSoundBanks) # addiu $s5, $s5, 0x33a8 /* B665AC 800EF40C 26D6E1B8 */ addiu $s6, %lo(D_8016E1B8) # addiu $s6, $s6, -0x1e48 /* B665B0 800EF410 C434A4C0 */ lwc1 $f20, %lo(D_8014A4C0)($at) /* B665B4 800EF414 00009025 */ move $s2, $zero diff --git a/asm/non_matchings/code/code_800EC960/func_800F3188.s b/asm/non_matchings/code/code_800EC960/func_800F3188.s index d6e13e5282..ba9d7ea3de 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F3188.s +++ b/asm/non_matchings/code/code_800EC960/func_800F3188.s @@ -26,10 +26,10 @@ glabel func_800F3188 /* B6A32C 800F318C 308400FF */ andi $a0, $a0, 0xff /* B6A330 800F3190 AFA50004 */ sw $a1, 4($sp) /* B6A334 800F3194 00047080 */ sll $t6, $a0, 2 -/* B6A338 800F3198 3C0F8013 */ lui $t7, %hi(D_801333A8) +/* B6A338 800F3198 3C0F8013 */ lui $t7, %hi(gSoundBanks) /* B6A33C 800F319C 30A500FF */ andi $a1, $a1, 0xff /* B6A340 800F31A0 01EE7821 */ addu $t7, $t7, $t6 -/* B6A344 800F31A4 8DEF33A8 */ lw $t7, %lo(D_801333A8)($t7) +/* B6A344 800F31A4 8DEF33A8 */ lw $t7, %lo(gSoundBanks)($t7) /* B6A348 800F31A8 0005C080 */ sll $t8, $a1, 2 /* B6A34C 800F31AC 0305C023 */ subu $t8, $t8, $a1 /* B6A350 800F31B0 0018C100 */ sll $t8, $t8, 4 diff --git a/asm/non_matchings/code/code_800EC960/func_800F32F0.s b/asm/non_matchings/code/code_800EC960/func_800F32F0.s index fe788a4b0b..153f6a6d35 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F32F0.s +++ b/asm/non_matchings/code/code_800EC960/func_800F32F0.s @@ -8,10 +8,10 @@ glabel func_800F32F0 /* B6A494 800F32F4 308400FF */ andi $a0, $a0, 0xff /* B6A498 800F32F8 AFA50004 */ sw $a1, 4($sp) /* B6A49C 800F32FC 00047080 */ sll $t6, $a0, 2 -/* B6A4A0 800F3300 3C0F8013 */ lui $t7, %hi(D_801333A8) +/* B6A4A0 800F3300 3C0F8013 */ lui $t7, %hi(gSoundBanks) /* B6A4A4 800F3304 30A500FF */ andi $a1, $a1, 0xff /* B6A4A8 800F3308 01EE7821 */ addu $t7, $t7, $t6 -/* B6A4AC 800F330C 8DEF33A8 */ lw $t7, %lo(D_801333A8)($t7) +/* B6A4AC 800F330C 8DEF33A8 */ lw $t7, %lo(gSoundBanks)($t7) /* B6A4B0 800F3310 0005C080 */ sll $t8, $a1, 2 /* B6A4B4 800F3314 0305C023 */ subu $t8, $t8, $a1 /* B6A4B8 800F3318 0018C100 */ sll $t8, $t8, 4 diff --git a/asm/non_matchings/code/code_800EC960/func_800F35EC.s b/asm/non_matchings/code/code_800EC960/func_800F35EC.s index 967763a3b0..63134b9b7c 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F35EC.s +++ b/asm/non_matchings/code/code_800EC960/func_800F35EC.s @@ -26,10 +26,10 @@ glabel func_800F35EC /* B6A790 800F35F0 308400FF */ andi $a0, $a0, 0xff /* B6A794 800F35F4 AFA50004 */ sw $a1, 4($sp) /* B6A798 800F35F8 00047080 */ sll $t6, $a0, 2 -/* B6A79C 800F35FC 3C0F8013 */ lui $t7, %hi(D_801333A8) +/* B6A79C 800F35FC 3C0F8013 */ lui $t7, %hi(gSoundBanks) /* B6A7A0 800F3600 30A500FF */ andi $a1, $a1, 0xff /* B6A7A4 800F3604 01EE7821 */ addu $t7, $t7, $t6 -/* B6A7A8 800F3608 8DEF33A8 */ lw $t7, %lo(D_801333A8)($t7) +/* B6A7A8 800F3608 8DEF33A8 */ lw $t7, %lo(gSoundBanks)($t7) /* B6A7AC 800F360C 0005C080 */ sll $t8, $a1, 2 /* B6A7B0 800F3610 0305C023 */ subu $t8, $t8, $a1 /* B6A7B4 800F3614 0018C100 */ sll $t8, $t8, 4 diff --git a/asm/non_matchings/code/code_800EC960/func_800F3A08.s b/asm/non_matchings/code/code_800EC960/func_800F3A08.s index 5e001f734f..541bd0808c 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F3A08.s +++ b/asm/non_matchings/code/code_800EC960/func_800F3A08.s @@ -17,11 +17,11 @@ glabel func_800F3A08 /* B6ABB8 800F3A18 93A8004F */ lbu $t0, 0x4f($sp) /* B6ABBC 800F3A1C 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B6ABC0 800F3A20 44811000 */ mtc1 $at, $f2 -/* B6ABC4 800F3A24 3C198013 */ lui $t9, %hi(D_801333A8) +/* B6ABC4 800F3A24 3C198013 */ lui $t9, %hi(gSoundBanks) /* B6ABC8 800F3A28 000FC080 */ sll $t8, $t7, 2 /* B6ABCC 800F3A2C 0338C821 */ addu $t9, $t9, $t8 /* B6ABD0 800F3A30 00084880 */ sll $t1, $t0, 2 -/* B6ABD4 800F3A34 8F3933A8 */ lw $t9, %lo(D_801333A8)($t9) +/* B6ABD4 800F3A34 8F3933A8 */ lw $t9, %lo(gSoundBanks)($t9) /* B6ABD8 800F3A38 01284823 */ subu $t1, $t1, $t0 /* B6ABDC 800F3A3C 240E0040 */ li $t6, 64 /* B6ABE0 800F3A40 00094900 */ sll $t1, $t1, 4 diff --git a/asm/non_matchings/code/code_800EC960/func_800F41E0.s b/asm/non_matchings/code/code_800EC960/func_800F41E0.s index c1c89c6b91..4b34988a8b 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F41E0.s +++ b/asm/non_matchings/code/code_800EC960/func_800F41E0.s @@ -3,7 +3,7 @@ glabel func_800F41E0 /* B6B384 800F41E4 AFBF001C */ sw $ra, 0x1c($sp) /* B6B388 800F41E8 AFA40020 */ sw $a0, 0x20($sp) /* B6B38C 800F41EC AFA50024 */ sw $a1, 0x24($sp) -/* B6B390 800F41F0 0C0399F0 */ jal func_800E67C0 +/* B6B390 800F41F0 0C0399F0 */ jal Audio_NextRandom /* B6B394 800F41F4 AFA60028 */ sw $a2, 0x28($sp) /* B6B398 800F41F8 93AF002B */ lbu $t7, 0x2b($sp) /* B6B39C 800F41FC 97AE0026 */ lhu $t6, 0x26($sp) diff --git a/asm/non_matchings/code/code_800EC960/func_800F4C58.s b/asm/non_matchings/code/code_800EC960/func_800F4C58.s index 5a0d4176a5..5f4c414f4e 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F4C58.s +++ b/asm/non_matchings/code/code_800EC960/func_800F4C58.s @@ -54,8 +54,8 @@ glabel func_800F4C58 /* B6BEC0 800F4D20 000E70C0 */ sll $t6, $t6, 3 /* B6BEC4 800F4D24 3C0F8017 */ lui $t7, %hi(D_8016E1B8) # $t7, 0x8017 /* B6BEC8 800F4D28 25EFE1B8 */ addiu $t7, %lo(D_8016E1B8) # addiu $t7, $t7, -0x1e48 -/* B6BECC 800F4D2C 3C138013 */ lui $s3, %hi(D_801333A8) # $s3, 0x8013 -/* B6BED0 800F4D30 267333A8 */ addiu $s3, %lo(D_801333A8) # addiu $s3, $s3, 0x33a8 +/* B6BECC 800F4D2C 3C138013 */ lui $s3, %hi(gSoundBanks) # $s3, 0x8013 +/* B6BED0 800F4D30 267333A8 */ addiu $s3, %lo(gSoundBanks) # addiu $s3, $s3, 0x33a8 /* B6BED4 800F4D34 01CFB021 */ addu $s6, $t6, $t7 /* B6BED8 800F4D38 3C150602 */ lui $s5, 0x602 /* B6BEDC 800F4D3C 24140030 */ li $s4, 48 diff --git a/asm/non_matchings/code/code_800F7260/Audio_PlaySoundGeneral.s b/asm/non_matchings/code/code_800F7260/Audio_PlaySoundGeneral.s deleted file mode 100644 index 656b398c35..0000000000 --- a/asm/non_matchings/code/code_800F7260/Audio_PlaySoundGeneral.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel Audio_PlaySoundGeneral -/* B6E52C 800F738C 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* B6E530 800F7390 AFA40010 */ sw $a0, 0x10($sp) -/* B6E534 800F7394 3084FFFF */ andi $a0, $a0, 0xffff -/* B6E538 800F7398 00047303 */ sra $t6, $a0, 0xc -/* B6E53C 800F739C 31CF00FF */ andi $t7, $t6, 0xff -/* B6E540 800F73A0 3C188017 */ lui $t8, %hi(D_8016E264) -/* B6E544 800F73A4 030FC021 */ addu $t8, $t8, $t7 -/* B6E548 800F73A8 9318E264 */ lbu $t8, %lo(D_8016E264)($t8) -/* B6E54C 800F73AC AFB00004 */ sw $s0, 4($sp) -/* B6E550 800F73B0 AFA60018 */ sw $a2, 0x18($sp) -/* B6E554 800F73B4 30C600FF */ andi $a2, $a2, 0xff -/* B6E558 800F73B8 00A08025 */ move $s0, $a1 -/* B6E55C 800F73BC AFB2000C */ sw $s2, 0xc($sp) -/* B6E560 800F73C0 17000042 */ bnez $t8, .L800F74CC -/* B6E564 800F73C4 AFB10008 */ sw $s1, 8($sp) -/* B6E568 800F73C8 3C0B8013 */ lui $t3, %hi(D_801333A0) # $t3, 0x8013 -/* B6E56C 800F73CC 256B33A0 */ addiu $t3, %lo(D_801333A0) # addiu $t3, $t3, 0x33a0 -/* B6E570 800F73D0 91790000 */ lbu $t9, ($t3) -/* B6E574 800F73D4 240C0018 */ li $t4, 24 -/* B6E578 800F73D8 3C0F8013 */ lui $t7, %hi(D_801333F4) # $t7, 0x8013 -/* B6E57C 800F73DC 032C0019 */ multu $t9, $t4 -/* B6E580 800F73E0 91EF33F4 */ lbu $t7, %lo(D_801333F4)($t7) -/* B6E584 800F73E4 3C0A8017 */ lui $t2, %hi(D_8016C9A0) # $t2, 0x8017 -/* B6E588 800F73E8 254AC9A0 */ addiu $t2, %lo(D_8016C9A0) # addiu $t2, $t2, -0x3660 -/* B6E58C 800F73EC 3C128017 */ lui $s2, %hi(D_8016E2F8) # $s2, 0x8017 -/* B6E590 800F73F0 3C118017 */ lui $s1, %hi(D_8016E310) # $s1, 0x8017 -/* B6E594 800F73F4 3C0D8017 */ lui $t5, %hi(D_8016E2E0) # $t5, 0x8017 -/* B6E598 800F73F8 25ADE2E0 */ addiu $t5, %lo(D_8016E2E0) # addiu $t5, $t5, -0x1d20 -/* B6E59C 800F73FC 2631E310 */ addiu $s1, %lo(D_8016E310) # addiu $s1, $s1, -0x1cf0 -/* B6E5A0 800F7400 2652E2F8 */ addiu $s2, %lo(D_8016E2F8) # addiu $s2, $s2, -0x1d08 -/* B6E5A4 800F7404 00007012 */ mflo $t6 -/* B6E5A8 800F7408 014E1021 */ addu $v0, $t2, $t6 -/* B6E5AC 800F740C 15E00024 */ bnez $t7, .L800F74A0 -/* B6E5B0 800F7410 00001825 */ move $v1, $zero -/* B6E5B4 800F7414 8FA90024 */ lw $t1, 0x24($sp) -/* B6E5B8 800F7418 8FA80020 */ lw $t0, 0x20($sp) -/* B6E5BC 800F741C 00032840 */ sll $a1, $v1, 1 -.L800F7420: -/* B6E5C0 800F7420 01A5C021 */ addu $t8, $t5, $a1 -/* B6E5C4 800F7424 97190000 */ lhu $t9, ($t8) -/* B6E5C8 800F7428 02237021 */ addu $t6, $s1, $v1 -/* B6E5CC 800F742C 54990018 */ bnel $a0, $t9, .L800F7490 -/* B6E5D0 800F7430 24630001 */ addiu $v1, $v1, 1 -/* B6E5D4 800F7434 91CF0000 */ lbu $t7, ($t6) -/* B6E5D8 800F7438 0245C021 */ addu $t8, $s2, $a1 -/* B6E5DC 800F743C 0245C821 */ addu $t9, $s2, $a1 -/* B6E5E0 800F7440 15E00003 */ bnez $t7, .L800F7450 -/* B6E5E4 800F7444 2403000A */ li $v1, 10 -/* B6E5E8 800F7448 10000010 */ b .L800F748C -/* B6E5EC 800F744C 97040000 */ lhu $a0, ($t8) -.L800F7450: -/* B6E5F0 800F7450 972E0000 */ lhu $t6, ($t9) -/* B6E5F4 800F7454 AC500004 */ sw $s0, 4($v0) -/* B6E5F8 800F7458 A0460008 */ sb $a2, 8($v0) -/* B6E5FC 800F745C AC47000C */ sw $a3, 0xc($v0) -/* B6E600 800F7460 AC480010 */ sw $t0, 0x10($v0) -/* B6E604 800F7464 AC490014 */ sw $t1, 0x14($v0) -/* B6E608 800F7468 A44E0000 */ sh $t6, ($v0) -/* B6E60C 800F746C 916F0000 */ lbu $t7, ($t3) -/* B6E610 800F7470 25F80001 */ addiu $t8, $t7, 1 -/* B6E614 800F7474 331900FF */ andi $t9, $t8, 0xff -/* B6E618 800F7478 032C0019 */ multu $t9, $t4 -/* B6E61C 800F747C A1780000 */ sb $t8, ($t3) -/* B6E620 800F7480 00007012 */ mflo $t6 -/* B6E624 800F7484 014E1021 */ addu $v0, $t2, $t6 -/* B6E628 800F7488 00000000 */ nop -.L800F748C: -/* B6E62C 800F748C 24630001 */ addiu $v1, $v1, 1 -.L800F7490: -/* B6E630 800F7490 306300FF */ andi $v1, $v1, 0xff -/* B6E634 800F7494 2861000A */ slti $at, $v1, 0xa -/* B6E638 800F7498 5420FFE1 */ bnezl $at, .L800F7420 -/* B6E63C 800F749C 00032840 */ sll $a1, $v1, 1 -.L800F74A0: -/* B6E640 800F74A0 8FA80020 */ lw $t0, 0x20($sp) -/* B6E644 800F74A4 8FA90024 */ lw $t1, 0x24($sp) -/* B6E648 800F74A8 A4440000 */ sh $a0, ($v0) -/* B6E64C 800F74AC AC500004 */ sw $s0, 4($v0) -/* B6E650 800F74B0 A0460008 */ sb $a2, 8($v0) -/* B6E654 800F74B4 AC47000C */ sw $a3, 0xc($v0) -/* B6E658 800F74B8 AC480010 */ sw $t0, 0x10($v0) -/* B6E65C 800F74BC AC490014 */ sw $t1, 0x14($v0) -/* B6E660 800F74C0 916F0000 */ lbu $t7, ($t3) -/* B6E664 800F74C4 25F80001 */ addiu $t8, $t7, 1 -/* B6E668 800F74C8 A1780000 */ sb $t8, ($t3) -.L800F74CC: -/* B6E66C 800F74CC 8FB00004 */ lw $s0, 4($sp) -/* B6E670 800F74D0 8FB10008 */ lw $s1, 8($sp) -/* B6E674 800F74D4 8FB2000C */ lw $s2, 0xc($sp) -/* B6E678 800F74D8 03E00008 */ jr $ra -/* B6E67C 800F74DC 27BD0010 */ addiu $sp, $sp, 0x10 - diff --git a/asm/non_matchings/code/code_800F7260/func_800F7260.s b/asm/non_matchings/code/code_800F7260/func_800F7260.s deleted file mode 100644 index 780124515b..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F7260.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800F7260 -/* B6E400 800F7260 AFA40000 */ sw $a0, ($sp) -/* B6E404 800F7264 3C058017 */ lui $a1, %hi(D_8016E264) # $a1, 0x8017 -/* B6E408 800F7268 3084FFFF */ andi $a0, $a0, 0xffff -/* B6E40C 800F726C 24A5E264 */ addiu $a1, %lo(D_8016E264) # addiu $a1, $a1, -0x1d9c -/* B6E410 800F7270 00001025 */ move $v0, $zero -/* B6E414 800F7274 24060001 */ li $a2, 1 -.L800F7278: -/* B6E418 800F7278 308E0001 */ andi $t6, $a0, 1 -/* B6E41C 800F727C 11C00004 */ beqz $t6, .L800F7290 -/* B6E420 800F7280 00801825 */ move $v1, $a0 -/* B6E424 800F7284 00A27821 */ addu $t7, $a1, $v0 -/* B6E428 800F7288 10000003 */ b .L800F7298 -/* B6E42C 800F728C A1E60000 */ sb $a2, ($t7) -.L800F7290: -/* B6E430 800F7290 00A2C021 */ addu $t8, $a1, $v0 -/* B6E434 800F7294 A3000000 */ sb $zero, ($t8) -.L800F7298: -/* B6E438 800F7298 24420001 */ addiu $v0, $v0, 1 -/* B6E43C 800F729C 304200FF */ andi $v0, $v0, 0xff -/* B6E440 800F72A0 28410007 */ slti $at, $v0, 7 -/* B6E444 800F72A4 00032043 */ sra $a0, $v1, 1 -/* B6E448 800F72A8 1420FFF3 */ bnez $at, .L800F7278 -/* B6E44C 800F72AC 3084FFFF */ andi $a0, $a0, 0xffff -/* B6E450 800F72B0 03E00008 */ jr $ra -/* B6E454 800F72B4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F72B8.s b/asm/non_matchings/code/code_800F7260/func_800F72B8.s deleted file mode 100644 index 6f84e741d2..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F72B8.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800F72B8 -/* B6E458 800F72B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6E45C 800F72BC AFA40018 */ sw $a0, 0x18($sp) -/* B6E460 800F72C0 3C028013 */ lui $v0, %hi(D_801333D0) # $v0, 0x8013 -/* B6E464 800F72C4 93AF001B */ lbu $t7, 0x1b($sp) -/* B6E468 800F72C8 244233D0 */ addiu $v0, %lo(D_801333D0) # addiu $v0, $v0, 0x33d0 -/* B6E46C 800F72CC 944E0000 */ lhu $t6, ($v0) -/* B6E470 800F72D0 24180001 */ li $t8, 1 -/* B6E474 800F72D4 01F8C804 */ sllv $t9, $t8, $t7 -/* B6E478 800F72D8 AFBF0014 */ sw $ra, 0x14($sp) -/* B6E47C 800F72DC 01D94025 */ or $t0, $t6, $t9 -/* B6E480 800F72E0 A4480000 */ sh $t0, ($v0) -/* B6E484 800F72E4 00002025 */ move $a0, $zero -/* B6E488 800F72E8 24050002 */ li $a1, 2 -/* B6E48C 800F72EC 24060040 */ li $a2, 64 -/* B6E490 800F72F0 0C03E890 */ jal func_800FA240 -/* B6E494 800F72F4 2407000F */ li $a3, 15 -/* B6E498 800F72F8 24040003 */ li $a0, 3 -/* B6E49C 800F72FC 24050002 */ li $a1, 2 -/* B6E4A0 800F7300 24060040 */ li $a2, 64 -/* B6E4A4 800F7304 0C03E890 */ jal func_800FA240 -/* B6E4A8 800F7308 2407000F */ li $a3, 15 -/* B6E4AC 800F730C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6E4B0 800F7310 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6E4B4 800F7314 03E00008 */ jr $ra -/* B6E4B8 800F7318 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F731C.s b/asm/non_matchings/code/code_800F7260/func_800F731C.s deleted file mode 100644 index 231d78d833..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F731C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800F731C -/* B6E4BC 800F731C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6E4C0 800F7320 3C028013 */ lui $v0, %hi(D_801333D0) # $v0, 0x8013 -/* B6E4C4 800F7324 244233D0 */ addiu $v0, %lo(D_801333D0) # addiu $v0, $v0, 0x33d0 -/* B6E4C8 800F7328 AFA40018 */ sw $a0, 0x18($sp) -/* B6E4CC 800F732C 944E0000 */ lhu $t6, ($v0) -/* B6E4D0 800F7330 308400FF */ andi $a0, $a0, 0xff -/* B6E4D4 800F7334 240F0001 */ li $t7, 1 -/* B6E4D8 800F7338 008FC004 */ sllv $t8, $t7, $a0 -/* B6E4DC 800F733C 3B19FFFF */ xori $t9, $t8, 0xffff -/* B6E4E0 800F7340 01D94024 */ and $t0, $t6, $t9 -/* B6E4E4 800F7344 3109FFFF */ andi $t1, $t0, 0xffff -/* B6E4E8 800F7348 AFBF0014 */ sw $ra, 0x14($sp) -/* B6E4EC 800F734C 1520000B */ bnez $t1, .L800F737C -/* B6E4F0 800F7350 A4480000 */ sh $t0, ($v0) -/* B6E4F4 800F7354 00002025 */ move $a0, $zero -/* B6E4F8 800F7358 24050002 */ li $a1, 2 -/* B6E4FC 800F735C 2406007F */ li $a2, 127 -/* B6E500 800F7360 0C03E890 */ jal func_800FA240 -/* B6E504 800F7364 2407000F */ li $a3, 15 -/* B6E508 800F7368 24040003 */ li $a0, 3 -/* B6E50C 800F736C 24050002 */ li $a1, 2 -/* B6E510 800F7370 2406007F */ li $a2, 127 -/* B6E514 800F7374 0C03E890 */ jal func_800FA240 -/* B6E518 800F7378 2407000F */ li $a3, 15 -.L800F737C: -/* B6E51C 800F737C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6E520 800F7380 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6E524 800F7384 03E00008 */ jr $ra -/* B6E528 800F7388 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F74E0.s b/asm/non_matchings/code/code_800F7260/func_800F74E0.s deleted file mode 100644 index 8f470ea5be..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F74E0.s +++ /dev/null @@ -1,126 +0,0 @@ -.late_rodata -glabel jtbl_8014A620 - .word L800F7534 - .word L800F7560 - .word L800F759C - .word L800F75C0 - .word L800F75F4 - .word L800F7628 - -.text -glabel func_800F74E0 -/* B6E680 800F74E0 3C028013 */ lui $v0, %hi(D_801333A4) # $v0, 0x8013 -/* B6E684 800F74E4 3C038013 */ lui $v1, %hi(D_801333A0) # $v1, 0x8013 -/* B6E688 800F74E8 904233A4 */ lbu $v0, %lo(D_801333A4)($v0) -/* B6E68C 800F74EC 906333A0 */ lbu $v1, %lo(D_801333A0)($v1) -/* B6E690 800F74F0 AFA40000 */ sw $a0, ($sp) -/* B6E694 800F74F4 308400FF */ andi $a0, $a0, 0xff -/* B6E698 800F74F8 1062005F */ beq $v1, $v0, .L800F7678 -/* B6E69C 800F74FC 00A03825 */ move $a3, $a1 -/* B6E6A0 800F7500 3C088017 */ lui $t0, %hi(D_8016C9A0) # $t0, 0x8017 -/* B6E6A4 800F7504 2508C9A0 */ addiu $t0, %lo(D_8016C9A0) # addiu $t0, $t0, -0x3660 -/* B6E6A8 800F7508 00803025 */ move $a2, $a0 -/* B6E6AC 800F750C 24090018 */ li $t1, 24 -/* B6E6B0 800F7510 2CC10006 */ sltiu $at, $a2, 6 -.L800F7514: -/* B6E6B4 800F7514 1020004C */ beqz $at, .L800F7648 -/* B6E6B8 800F7518 00002025 */ move $a0, $zero -/* B6E6BC 800F751C 00067080 */ sll $t6, $a2, 2 -/* B6E6C0 800F7520 3C018015 */ lui $at, %hi(jtbl_8014A620) -/* B6E6C4 800F7524 002E0821 */ addu $at, $at, $t6 -/* B6E6C8 800F7528 8C2EA620 */ lw $t6, %lo(jtbl_8014A620)($at) -/* B6E6CC 800F752C 01C00008 */ jr $t6 -/* B6E6D0 800F7530 00000000 */ nop -glabel L800F7534 -/* B6E6D4 800F7534 00490019 */ multu $v0, $t1 -/* B6E6D8 800F7538 94EF0028 */ lhu $t7, 0x28($a3) -/* B6E6DC 800F753C 31F8F000 */ andi $t8, $t7, 0xf000 -/* B6E6E0 800F7540 0000C812 */ mflo $t9 -/* B6E6E4 800F7544 01195021 */ addu $t2, $t0, $t9 -/* B6E6E8 800F7548 954B0000 */ lhu $t3, ($t2) -/* B6E6EC 800F754C 316CF000 */ andi $t4, $t3, 0xf000 -/* B6E6F0 800F7550 170C003D */ bne $t8, $t4, .L800F7648 -/* B6E6F4 800F7554 00000000 */ nop -/* B6E6F8 800F7558 1000003B */ b .L800F7648 -/* B6E6FC 800F755C 24040001 */ li $a0, 1 -glabel L800F7560 -/* B6E700 800F7560 00490019 */ multu $v0, $t1 -/* B6E704 800F7564 94EE0028 */ lhu $t6, 0x28($a3) -/* B6E708 800F7568 31CFF000 */ andi $t7, $t6, 0xf000 -/* B6E70C 800F756C 00006812 */ mflo $t5 -/* B6E710 800F7570 010D2821 */ addu $a1, $t0, $t5 -/* B6E714 800F7574 94B90000 */ lhu $t9, ($a1) -/* B6E718 800F7578 332AF000 */ andi $t2, $t9, 0xf000 -/* B6E71C 800F757C 15EA0032 */ bne $t7, $t2, .L800F7648 -/* B6E720 800F7580 00000000 */ nop -/* B6E724 800F7584 8CEB0000 */ lw $t3, ($a3) -/* B6E728 800F7588 8CB80004 */ lw $t8, 4($a1) -/* B6E72C 800F758C 1578002E */ bne $t3, $t8, .L800F7648 -/* B6E730 800F7590 00000000 */ nop -/* B6E734 800F7594 1000002C */ b .L800F7648 -/* B6E738 800F7598 24040001 */ li $a0, 1 -glabel L800F759C -/* B6E73C 800F759C 00490019 */ multu $v0, $t1 -/* B6E740 800F75A0 8CEC0000 */ lw $t4, ($a3) -/* B6E744 800F75A4 00006812 */ mflo $t5 -/* B6E748 800F75A8 010D7021 */ addu $t6, $t0, $t5 -/* B6E74C 800F75AC 8DD90004 */ lw $t9, 4($t6) -/* B6E750 800F75B0 15990025 */ bne $t4, $t9, .L800F7648 -/* B6E754 800F75B4 00000000 */ nop -/* B6E758 800F75B8 10000023 */ b .L800F7648 -/* B6E75C 800F75BC 24040001 */ li $a0, 1 -glabel L800F75C0 -/* B6E760 800F75C0 00490019 */ multu $v0, $t1 -/* B6E764 800F75C4 8CEA0000 */ lw $t2, ($a3) -/* B6E768 800F75C8 00007812 */ mflo $t7 -/* B6E76C 800F75CC 010F2821 */ addu $a1, $t0, $t7 -/* B6E770 800F75D0 8CAB0004 */ lw $t3, 4($a1) -/* B6E774 800F75D4 154B001C */ bne $t2, $t3, .L800F7648 -/* B6E778 800F75D8 00000000 */ nop -/* B6E77C 800F75DC 94F80028 */ lhu $t8, 0x28($a3) -/* B6E780 800F75E0 94AD0000 */ lhu $t5, ($a1) -/* B6E784 800F75E4 170D0018 */ bne $t8, $t5, .L800F7648 -/* B6E788 800F75E8 00000000 */ nop -/* B6E78C 800F75EC 10000016 */ b .L800F7648 -/* B6E790 800F75F0 24040001 */ li $a0, 1 -glabel L800F75F4 -/* B6E794 800F75F4 00490019 */ multu $v0, $t1 -/* B6E798 800F75F8 90EC000C */ lbu $t4, 0xc($a3) -/* B6E79C 800F75FC 00007012 */ mflo $t6 -/* B6E7A0 800F7600 010E2821 */ addu $a1, $t0, $t6 -/* B6E7A4 800F7604 90B90008 */ lbu $t9, 8($a1) -/* B6E7A8 800F7608 1599000F */ bne $t4, $t9, .L800F7648 -/* B6E7AC 800F760C 00000000 */ nop -/* B6E7B0 800F7610 94EF0028 */ lhu $t7, 0x28($a3) -/* B6E7B4 800F7614 94AA0000 */ lhu $t2, ($a1) -/* B6E7B8 800F7618 15EA000B */ bne $t7, $t2, .L800F7648 -/* B6E7BC 800F761C 00000000 */ nop -/* B6E7C0 800F7620 10000009 */ b .L800F7648 -/* B6E7C4 800F7624 24040001 */ li $a0, 1 -glabel L800F7628 -/* B6E7C8 800F7628 00490019 */ multu $v0, $t1 -/* B6E7CC 800F762C 94EB0028 */ lhu $t3, 0x28($a3) -/* B6E7D0 800F7630 0000C012 */ mflo $t8 -/* B6E7D4 800F7634 01186821 */ addu $t5, $t0, $t8 -/* B6E7D8 800F7638 95AE0000 */ lhu $t6, ($t5) -/* B6E7DC 800F763C 156E0002 */ bne $t3, $t6, .L800F7648 -/* B6E7E0 800F7640 00000000 */ nop -/* B6E7E4 800F7644 24040001 */ li $a0, 1 -.L800F7648: -/* B6E7E8 800F7648 50800008 */ beql $a0, $zero, .L800F766C -/* B6E7EC 800F764C 24420001 */ addiu $v0, $v0, 1 -/* B6E7F0 800F7650 00490019 */ multu $v0, $t1 -/* B6E7F4 800F7654 3C038013 */ lui $v1, %hi(D_801333A0) # $v1, 0x8013 -/* B6E7F8 800F7658 00006012 */ mflo $t4 -/* B6E7FC 800F765C 010CC821 */ addu $t9, $t0, $t4 -/* B6E800 800F7660 A7200000 */ sh $zero, ($t9) -/* B6E804 800F7664 906333A0 */ lbu $v1, %lo(D_801333A0)($v1) -/* B6E808 800F7668 24420001 */ addiu $v0, $v0, 1 -.L800F766C: -/* B6E80C 800F766C 304200FF */ andi $v0, $v0, 0xff -/* B6E810 800F7670 5462FFA8 */ bnel $v1, $v0, .L800F7514 -/* B6E814 800F7674 2CC10006 */ sltiu $at, $a2, 6 -.L800F7678: -/* B6E818 800F7678 03E00008 */ jr $ra -/* B6E81C 800F767C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F7680.s b/asm/non_matchings/code/code_800F7260/func_800F7680.s index cc53a35417..a4b6b6c1b1 100644 --- a/asm/non_matchings/code/code_800F7260/func_800F7680.s +++ b/asm/non_matchings/code/code_800F7260/func_800F7680.s @@ -37,8 +37,8 @@ glabel func_800F7680 /* B6E8AC 800F770C 0015AB03 */ sra $s5, $s5, 0xc /* B6E8B0 800F7710 32B500FF */ andi $s5, $s5, 0xff .L800F7714: -/* B6E8B4 800F7714 3C0E8013 */ lui $t6, %hi(D_801333A8) # $t6, 0x8013 -/* B6E8B8 800F7718 25CE33A8 */ addiu $t6, %lo(D_801333A8) # addiu $t6, $t6, 0x33a8 +/* B6E8B4 800F7714 3C0E8013 */ lui $t6, %hi(gSoundBanks) # $t6, 0x8013 +/* B6E8B8 800F7718 25CE33A8 */ addiu $t6, %lo(gSoundBanks) # addiu $t6, $t6, 0x33a8 /* B6E8BC 800F771C 0015C880 */ sll $t9, $s5, 2 /* B6E8C0 800F7720 032E4021 */ addu $t0, $t9, $t6 /* B6E8C4 800F7724 8D0B0000 */ lw $t3, ($t0) diff --git a/asm/non_matchings/code/code_800F7260/func_800F7B54.s b/asm/non_matchings/code/code_800F7260/func_800F7B54.s deleted file mode 100644 index 71d731799f..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F7B54.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel func_800F7B54 -/* B6ECF4 800F7B54 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6ECF8 800F7B58 AFA50034 */ sw $a1, 0x34($sp) -/* B6ECFC 800F7B5C 93B80037 */ lbu $t8, 0x37($sp) -/* B6ED00 800F7B60 240B0030 */ li $t3, 48 -/* B6ED04 800F7B64 AFB00018 */ sw $s0, 0x18($sp) -/* B6ED08 800F7B68 030B0019 */ multu $t8, $t3 -/* B6ED0C 800F7B6C 309000FF */ andi $s0, $a0, 0xff -/* B6ED10 800F7B70 3C0F8013 */ lui $t7, %hi(D_801333A8) # $t7, 0x8013 -/* B6ED14 800F7B74 25EF33A8 */ addiu $t7, %lo(D_801333A8) # addiu $t7, $t7, 0x33a8 -/* B6ED18 800F7B78 00107080 */ sll $t6, $s0, 2 -/* B6ED1C 800F7B7C 01CF5021 */ addu $t2, $t6, $t7 -/* B6ED20 800F7B80 8D490000 */ lw $t1, ($t2) -/* B6ED24 800F7B84 AFBF001C */ sw $ra, 0x1c($sp) -/* B6ED28 800F7B88 AFA40030 */ sw $a0, 0x30($sp) -/* B6ED2C 800F7B8C 0000C812 */ mflo $t9 -/* B6ED30 800F7B90 01393021 */ addu $a2, $t1, $t9 -/* B6ED34 800F7B94 94CC0026 */ lhu $t4, 0x26($a2) -/* B6ED38 800F7B98 318D0008 */ andi $t5, $t4, 8 -/* B6ED3C 800F7B9C 11A00009 */ beqz $t5, .L800F7BC4 -/* B6ED40 800F7BA0 00000000 */ nop -/* B6ED44 800F7BA4 90C4002E */ lbu $a0, 0x2e($a2) -/* B6ED48 800F7BA8 AFAA0024 */ sw $t2, 0x24($sp) -/* B6ED4C 800F7BAC 0C03DCC7 */ jal func_800F731C -/* B6ED50 800F7BB0 AFA6002C */ sw $a2, 0x2c($sp) -/* B6ED54 800F7BB4 8FAA0024 */ lw $t2, 0x24($sp) -/* B6ED58 800F7BB8 8FA6002C */ lw $a2, 0x2c($sp) -/* B6ED5C 800F7BBC 240B0030 */ li $t3, 48 -/* B6ED60 800F7BC0 8D490000 */ lw $t1, ($t2) -.L800F7BC4: -/* B6ED64 800F7BC4 3C0E8017 */ lui $t6, %hi(D_8016E1A0) # $t6, 0x8017 -/* B6ED68 800F7BC8 25CEE1A0 */ addiu $t6, %lo(D_8016E1A0) # addiu $t6, $t6, -0x1e60 -/* B6ED6C 800F7BCC 020E1021 */ addu $v0, $s0, $t6 -/* B6ED70 800F7BD0 904F0000 */ lbu $t7, ($v0) -/* B6ED74 800F7BD4 93A80037 */ lbu $t0, 0x37($sp) -/* B6ED78 800F7BD8 550F0005 */ bnel $t0, $t7, .L800F7BF0 -/* B6ED7C 800F7BDC 90CC002D */ lbu $t4, 0x2d($a2) -/* B6ED80 800F7BE0 90D8002C */ lbu $t8, 0x2c($a2) -/* B6ED84 800F7BE4 10000008 */ b .L800F7C08 -/* B6ED88 800F7BE8 A0580000 */ sb $t8, ($v0) -/* B6ED8C 800F7BEC 90CC002D */ lbu $t4, 0x2d($a2) -.L800F7BF0: -/* B6ED90 800F7BF0 90D9002C */ lbu $t9, 0x2c($a2) -/* B6ED94 800F7BF4 018B0019 */ multu $t4, $t3 -/* B6ED98 800F7BF8 00006812 */ mflo $t5 -/* B6ED9C 800F7BFC 012D7021 */ addu $t6, $t1, $t5 -/* B6EDA0 800F7C00 A1D9002C */ sb $t9, 0x2c($t6) -/* B6EDA4 800F7C04 8D490000 */ lw $t1, ($t2) -.L800F7C08: -/* B6EDA8 800F7C08 90D8002C */ lbu $t8, 0x2c($a2) -/* B6EDAC 800F7C0C 90CF002D */ lbu $t7, 0x2d($a2) -/* B6EDB0 800F7C10 3C198017 */ lui $t9, %hi(D_8016E1A8) # $t9, 0x8017 -/* B6EDB4 800F7C14 030B0019 */ multu $t8, $t3 -/* B6EDB8 800F7C18 2739E1A8 */ addiu $t9, %lo(D_8016E1A8) # addiu $t9, $t9, -0x1e58 -/* B6EDBC 800F7C1C 02191821 */ addu $v1, $s0, $t9 -/* B6EDC0 800F7C20 240700FF */ li $a3, 255 -/* B6EDC4 800F7C24 3C048013 */ lui $a0, %hi(D_80130578) -/* B6EDC8 800F7C28 00001025 */ move $v0, $zero -/* B6EDCC 800F7C2C 00006012 */ mflo $t4 -/* B6EDD0 800F7C30 012C6821 */ addu $t5, $t1, $t4 -/* B6EDD4 800F7C34 A1AF002D */ sb $t7, 0x2d($t5) -/* B6EDD8 800F7C38 906E0000 */ lbu $t6, ($v1) -/* B6EDDC 800F7C3C A0C7002C */ sb $a3, 0x2c($a2) -/* B6EDE0 800F7C40 A0CE002D */ sb $t6, 0x2d($a2) -/* B6EDE4 800F7C44 906F0000 */ lbu $t7, ($v1) -/* B6EDE8 800F7C48 8D4C0000 */ lw $t4, ($t2) -/* B6EDEC 800F7C4C 93B80037 */ lbu $t8, 0x37($sp) -/* B6EDF0 800F7C50 01EB0019 */ multu $t7, $t3 -/* B6EDF4 800F7C54 3C0F8013 */ lui $t7, %hi(D_801333CC) # $t7, 0x8013 -/* B6EDF8 800F7C58 00006812 */ mflo $t5 -/* B6EDFC 800F7C5C 018DC821 */ addu $t9, $t4, $t5 -/* B6EE00 800F7C60 A338002C */ sb $t8, 0x2c($t9) -/* B6EE04 800F7C64 93AE0037 */ lbu $t6, 0x37($sp) -/* B6EE08 800F7C68 0010C080 */ sll $t8, $s0, 2 -/* B6EE0C 800F7C6C 0310C023 */ subu $t8, $t8, $s0 -/* B6EE10 800F7C70 A06E0000 */ sb $t6, ($v1) -/* B6EE14 800F7C74 A0C0002A */ sb $zero, 0x2a($a2) -/* B6EE18 800F7C78 91EF33CC */ lbu $t7, %lo(D_801333CC)($t7) -/* B6EE1C 800F7C7C 3C198017 */ lui $t9, %hi(D_8016E1B8) # $t9, 0x8017 -/* B6EE20 800F7C80 2739E1B8 */ addiu $t9, %lo(D_8016E1B8) # addiu $t9, $t9, -0x1e48 -/* B6EE24 800F7C84 000F60C0 */ sll $t4, $t7, 3 -/* B6EE28 800F7C88 018F6023 */ subu $t4, $t4, $t7 -/* B6EE2C 800F7C8C 01906821 */ addu $t5, $t4, $s0 -/* B6EE30 800F7C90 008D2021 */ addu $a0, $a0, $t5 -/* B6EE34 800F7C94 90840578 */ lbu $a0, %lo(D_80130578)($a0) -/* B6EE38 800F7C98 0018C0C0 */ sll $t8, $t8, 3 -/* B6EE3C 800F7C9C 03193021 */ addu $a2, $t8, $t9 -/* B6EE40 800F7CA0 1880000D */ blez $a0, .L800F7CD8 -/* B6EE44 800F7CA4 00802825 */ move $a1, $a0 -/* B6EE48 800F7CA8 000270C0 */ sll $t6, $v0, 3 -.L800F7CAC: -/* B6EE4C 800F7CAC 00CE1821 */ addu $v1, $a2, $t6 -/* B6EE50 800F7CB0 906F0004 */ lbu $t7, 4($v1) -/* B6EE54 800F7CB4 550F0004 */ bnel $t0, $t7, .L800F7CC8 -/* B6EE58 800F7CB8 24420001 */ addiu $v0, $v0, 1 -/* B6EE5C 800F7CBC A0670004 */ sb $a3, 4($v1) -/* B6EE60 800F7CC0 308200FF */ andi $v0, $a0, 0xff -/* B6EE64 800F7CC4 24420001 */ addiu $v0, $v0, 1 -.L800F7CC8: -/* B6EE68 800F7CC8 304200FF */ andi $v0, $v0, 0xff -/* B6EE6C 800F7CCC 0045082A */ slt $at, $v0, $a1 -/* B6EE70 800F7CD0 5420FFF6 */ bnezl $at, .L800F7CAC -/* B6EE74 800F7CD4 000270C0 */ sll $t6, $v0, 3 -.L800F7CD8: -/* B6EE78 800F7CD8 8FBF001C */ lw $ra, 0x1c($sp) -/* B6EE7C 800F7CDC 8FB00018 */ lw $s0, 0x18($sp) -/* B6EE80 800F7CE0 27BD0030 */ addiu $sp, $sp, 0x30 -/* B6EE84 800F7CE4 03E00008 */ jr $ra -/* B6EE88 800F7CE8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F7CEC.s b/asm/non_matchings/code/code_800F7260/func_800F7CEC.s index 61804f7931..44af593ae7 100644 --- a/asm/non_matchings/code/code_800F7260/func_800F7CEC.s +++ b/asm/non_matchings/code/code_800F7260/func_800F7CEC.s @@ -32,8 +32,8 @@ glabel func_800F7CEC /* B6EEEC 800F7D4C 1420FFF9 */ bnez $at, .L800F7D34 /* B6EEF0 800F7D50 A0F50004 */ sb $s5, 4($a3) /* B6EEF4 800F7D54 93AF00B3 */ lbu $t7, 0xb3($sp) -/* B6EEF8 800F7D58 3C198013 */ lui $t9, %hi(D_801333A8) # $t9, 0x8013 -/* B6EEFC 800F7D5C 273933A8 */ addiu $t9, %lo(D_801333A8) # addiu $t9, $t9, 0x33a8 +/* B6EEF8 800F7D58 3C198013 */ lui $t9, %hi(gSoundBanks) # $t9, 0x8013 +/* B6EEFC 800F7D5C 273933A8 */ addiu $t9, %lo(gSoundBanks) # addiu $t9, $t9, 0x33a8 /* B6EF00 800F7D60 000FC080 */ sll $t8, $t7, 2 /* B6EF04 800F7D64 0319B021 */ addu $s6, $t8, $t9 /* B6EF08 800F7D68 8EC30000 */ lw $v1, ($s6) diff --git a/asm/non_matchings/code/code_800F7260/func_800F8480.s b/asm/non_matchings/code/code_800F7260/func_800F8480.s deleted file mode 100644 index bb0744c39f..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8480.s +++ /dev/null @@ -1,215 +0,0 @@ -glabel func_800F8480 -/* B6F620 800F8480 3C0E8013 */ lui $t6, %hi(D_801333CC) # $t6, 0x8013 -/* B6F624 800F8484 91CE33CC */ lbu $t6, %lo(D_801333CC)($t6) -/* B6F628 800F8488 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B6F62C 800F848C AFB20020 */ sw $s2, 0x20($sp) -/* B6F630 800F8490 000E78C0 */ sll $t7, $t6, 3 -/* B6F634 800F8494 309200FF */ andi $s2, $a0, 0xff -/* B6F638 800F8498 01EE7823 */ subu $t7, $t7, $t6 -/* B6F63C 800F849C 01F2C021 */ addu $t8, $t7, $s2 -/* B6F640 800F84A0 3C038013 */ lui $v1, %hi(D_80130578) -/* B6F644 800F84A4 00781821 */ addu $v1, $v1, $t8 -/* B6F648 800F84A8 90630578 */ lbu $v1, %lo(D_80130578)($v1) -/* B6F64C 800F84AC AFB40028 */ sw $s4, 0x28($sp) -/* B6F650 800F84B0 AFBF003C */ sw $ra, 0x3c($sp) -/* B6F654 800F84B4 AFBE0038 */ sw $fp, 0x38($sp) -/* B6F658 800F84B8 AFB70034 */ sw $s7, 0x34($sp) -/* B6F65C 800F84BC AFB60030 */ sw $s6, 0x30($sp) -/* B6F660 800F84C0 AFB5002C */ sw $s5, 0x2c($sp) -/* B6F664 800F84C4 AFB30024 */ sw $s3, 0x24($sp) -/* B6F668 800F84C8 AFB1001C */ sw $s1, 0x1c($sp) -/* B6F66C 800F84CC AFB00018 */ sw $s0, 0x18($sp) -/* B6F670 800F84D0 AFA40060 */ sw $a0, 0x60($sp) -/* B6F674 800F84D4 186000A6 */ blez $v1, .L800F8770 -/* B6F678 800F84D8 0000A025 */ move $s4, $zero -/* B6F67C 800F84DC 0012C880 */ sll $t9, $s2, 2 -/* B6F680 800F84E0 0332C823 */ subu $t9, $t9, $s2 -/* B6F684 800F84E4 3C088017 */ lui $t0, %hi(D_8016E1B8) # $t0, 0x8017 -/* B6F688 800F84E8 2508E1B8 */ addiu $t0, %lo(D_8016E1B8) # addiu $t0, $t0, -0x1e48 -/* B6F68C 800F84EC 0019C8C0 */ sll $t9, $t9, 3 -/* B6F690 800F84F0 03284821 */ addu $t1, $t9, $t0 -/* B6F694 800F84F4 3C138017 */ lui $s3, %hi(D_8016E260) # $s3, 0x8017 -/* B6F698 800F84F8 2673E260 */ addiu $s3, %lo(D_8016E260) # addiu $s3, $s3, -0x1da0 -/* B6F69C 800F84FC AFA90044 */ sw $t1, 0x44($sp) -/* B6F6A0 800F8500 241E0004 */ li $fp, 4 -/* B6F6A4 800F8504 241700FF */ li $s7, 255 -/* B6F6A8 800F8508 3C160602 */ lui $s6, 0x602 -.L800F850C: -/* B6F6AC 800F850C 8FAA0044 */ lw $t2, 0x44($sp) -/* B6F6B0 800F8510 001458C0 */ sll $t3, $s4, 3 -/* B6F6B4 800F8514 00126880 */ sll $t5, $s2, 2 -/* B6F6B8 800F8518 014B6021 */ addu $t4, $t2, $t3 -/* B6F6BC 800F851C 91910004 */ lbu $s1, 4($t4) -/* B6F6C0 800F8520 3C0E8013 */ lui $t6, %hi(D_801333A8) -/* B6F6C4 800F8524 01CD7021 */ addu $t6, $t6, $t5 -/* B6F6C8 800F8528 12F1008A */ beq $s7, $s1, .L800F8754 -/* B6F6CC 800F852C 00117880 */ sll $t7, $s1, 2 -/* B6F6D0 800F8530 8DCE33A8 */ lw $t6, %lo(D_801333A8)($t6) -/* B6F6D4 800F8534 01F17823 */ subu $t7, $t7, $s1 -/* B6F6D8 800F8538 92660000 */ lbu $a2, ($s3) -/* B6F6DC 800F853C 000F7900 */ sll $t7, $t7, 4 -/* B6F6E0 800F8540 01CF8021 */ addu $s0, $t6, $t7 -/* B6F6E4 800F8544 9202002A */ lbu $v0, 0x2a($s0) -/* B6F6E8 800F8548 3C048017 */ lui $a0, %hi(gAudioContext+0x3828) -/* B6F6EC 800F854C 0006C080 */ sll $t8, $a2, 2 -/* B6F6F0 800F8550 00982021 */ addu $a0, $a0, $t8 -/* B6F6F4 800F8554 24010002 */ li $at, 2 -/* B6F6F8 800F8558 14410053 */ bne $v0, $at, .L800F86A8 -/* B6F6FC 800F855C 8C8429A8 */ lw $a0, %lo(gAudioContext+0x3828)($a0) -/* B6F700 800F8560 96020026 */ lhu $v0, 0x26($s0) -/* B6F704 800F8564 3C198013 */ lui $t9, %hi(D_80130570) # $t9, 0x8013 -/* B6F708 800F8568 27390570 */ addiu $t9, %lo(D_80130570) # addiu $t9, $t9, 0x570 -/* B6F70C 800F856C 30480008 */ andi $t0, $v0, 8 -/* B6F710 800F8570 A206002E */ sb $a2, 0x2e($s0) -/* B6F714 800F8574 11000004 */ beqz $t0, .L800F8588 -/* B6F718 800F8578 0259A821 */ addu $s5, $s2, $t9 -/* B6F71C 800F857C 0C03DCAE */ jal func_800F72B8 -/* B6F720 800F8580 92640000 */ lbu $a0, ($s3) -/* B6F724 800F8584 96020026 */ lhu $v0, 0x26($s0) -.L800F8588: -/* B6F728 800F8588 304300C0 */ andi $v1, $v0, 0xc0 -/* B6F72C 800F858C 10600017 */ beqz $v1, .L800F85EC -/* B6F730 800F8590 24010040 */ li $at, 64 -/* B6F734 800F8594 10610007 */ beq $v1, $at, .L800F85B4 -/* B6F738 800F8598 24010080 */ li $at, 128 -/* B6F73C 800F859C 1061000A */ beq $v1, $at, .L800F85C8 -/* B6F740 800F85A0 240100C0 */ li $at, 192 -/* B6F744 800F85A4 1061000D */ beq $v1, $at, .L800F85DC -/* B6F748 800F85A8 00000000 */ nop -/* B6F74C 800F85AC 1000000F */ b .L800F85EC -/* B6F750 800F85B0 A200002F */ sb $zero, 0x2f($s0) -.L800F85B4: -/* B6F754 800F85B4 0C0399F0 */ jal func_800E67C0 -/* B6F758 800F85B8 00000000 */ nop -/* B6F75C 800F85BC 3049000F */ andi $t1, $v0, 0xf -/* B6F760 800F85C0 1000000A */ b .L800F85EC -/* B6F764 800F85C4 A209002F */ sb $t1, 0x2f($s0) -.L800F85C8: -/* B6F768 800F85C8 0C0399F0 */ jal func_800E67C0 -/* B6F76C 800F85CC 00000000 */ nop -/* B6F770 800F85D0 304A001F */ andi $t2, $v0, 0x1f -/* B6F774 800F85D4 10000005 */ b .L800F85EC -/* B6F778 800F85D8 A20A002F */ sb $t2, 0x2f($s0) -.L800F85DC: -/* B6F77C 800F85DC 0C0399F0 */ jal func_800E67C0 -/* B6F780 800F85E0 00000000 */ nop -/* B6F784 800F85E4 304B003F */ andi $t3, $v0, 0x3f -/* B6F788 800F85E8 A20B002F */ sb $t3, 0x2f($s0) -.L800F85EC: -/* B6F78C 800F85EC 324400FF */ andi $a0, $s2, 0xff -/* B6F790 800F85F0 322500FF */ andi $a1, $s1, 0xff -/* B6F794 800F85F4 0C03CE82 */ jal func_800F3A08 -/* B6F798 800F85F8 92660000 */ lbu $a2, ($s3) -/* B6F79C 800F85FC 926D0000 */ lbu $t5, ($s3) -/* B6F7A0 800F8600 24050001 */ li $a1, 1 -/* B6F7A4 800F8604 000D7200 */ sll $t6, $t5, 8 -/* B6F7A8 800F8608 0C0396C8 */ jal func_800E5B20 -/* B6F7AC 800F860C 01D62025 */ or $a0, $t6, $s6 -/* B6F7B0 800F8610 92780000 */ lbu $t8, ($s3) -/* B6F7B4 800F8614 96050028 */ lhu $a1, 0x28($s0) -/* B6F7B8 800F8618 0018CA00 */ sll $t9, $t8, 8 -/* B6F7BC 800F861C 03362025 */ or $a0, $t9, $s6 -/* B6F7C0 800F8620 00052E00 */ sll $a1, $a1, 0x18 -/* B6F7C4 800F8624 00052E03 */ sra $a1, $a1, 0x18 -/* B6F7C8 800F8628 0C0396C8 */ jal func_800E5B20 -/* B6F7CC 800F862C 34840004 */ ori $a0, $a0, 4 -/* B6F7D0 800F8630 92A80000 */ lbu $t0, ($s5) -/* B6F7D4 800F8634 5100000C */ beql $t0, $zero, .L800F8668 -/* B6F7D8 800F8638 960C0028 */ lhu $t4, 0x28($s0) -/* B6F7DC 800F863C 96050028 */ lhu $a1, 0x28($s0) -/* B6F7E0 800F8640 926A0000 */ lbu $t2, ($s3) -/* B6F7E4 800F8644 30A50100 */ andi $a1, $a1, 0x100 -/* B6F7E8 800F8648 00052A03 */ sra $a1, $a1, 8 -/* B6F7EC 800F864C 000A5A00 */ sll $t3, $t2, 8 -/* B6F7F0 800F8650 01762025 */ or $a0, $t3, $s6 -/* B6F7F4 800F8654 00052E00 */ sll $a1, $a1, 0x18 -/* B6F7F8 800F8658 00052E03 */ sra $a1, $a1, 0x18 -/* B6F7FC 800F865C 0C0396C8 */ jal func_800E5B20 -/* B6F800 800F8660 34840005 */ ori $a0, $a0, 5 -/* B6F804 800F8664 960C0028 */ lhu $t4, 0x28($s0) -.L800F8668: -/* B6F808 800F8668 3C0F8013 */ lui $t7, %hi(D_801333CC) # $t7, 0x8013 -/* B6F80C 800F866C 240E0005 */ li $t6, 5 -/* B6F810 800F8670 318D0C00 */ andi $t5, $t4, 0xc00 -/* B6F814 800F8674 51A00004 */ beql $t5, $zero, .L800F8688 -/* B6F818 800F8678 A20E002A */ sb $t6, 0x2a($s0) -/* B6F81C 800F867C 10000002 */ b .L800F8688 -/* B6F820 800F8680 A21E002A */ sb $fp, 0x2a($s0) -/* B6F824 800F8684 A20E002A */ sb $t6, 0x2a($s0) -.L800F8688: -/* B6F828 800F8688 91EF33CC */ lbu $t7, %lo(D_801333CC)($t7) -/* B6F82C 800F868C 3C038013 */ lui $v1, %hi(D_80130578) -/* B6F830 800F8690 000FC0C0 */ sll $t8, $t7, 3 -/* B6F834 800F8694 030FC023 */ subu $t8, $t8, $t7 -/* B6F838 800F8698 0312C821 */ addu $t9, $t8, $s2 -/* B6F83C 800F869C 00791821 */ addu $v1, $v1, $t9 -/* B6F840 800F86A0 1000002C */ b .L800F8754 -/* B6F844 800F86A4 90630578 */ lbu $v1, %lo(D_80130578)($v1) -.L800F86A8: -/* B6F848 800F86A8 908800C5 */ lbu $t0, 0xc5($a0) -/* B6F84C 800F86AC 324400FF */ andi $a0, $s2, 0xff -/* B6F850 800F86B0 24010003 */ li $at, 3 -/* B6F854 800F86B4 16E8000C */ bne $s7, $t0, .L800F86E8 -/* B6F858 800F86B8 00000000 */ nop -/* B6F85C 800F86BC 0C03DED5 */ jal func_800F7B54 -/* B6F860 800F86C0 322500FF */ andi $a1, $s1, 0xff -/* B6F864 800F86C4 3C098013 */ lui $t1, %hi(D_801333CC) # $t1, 0x8013 -/* B6F868 800F86C8 912933CC */ lbu $t1, %lo(D_801333CC)($t1) -/* B6F86C 800F86CC 3C038013 */ lui $v1, %hi(D_80130578) -/* B6F870 800F86D0 000950C0 */ sll $t2, $t1, 3 -/* B6F874 800F86D4 01495023 */ subu $t2, $t2, $t1 -/* B6F878 800F86D8 01525821 */ addu $t3, $t2, $s2 -/* B6F87C 800F86DC 006B1821 */ addu $v1, $v1, $t3 -/* B6F880 800F86E0 1000001C */ b .L800F8754 -/* B6F884 800F86E4 90630578 */ lbu $v1, %lo(D_80130578)($v1) -.L800F86E8: -/* B6F888 800F86E8 1441001A */ bne $v0, $at, .L800F8754 -/* B6F88C 800F86EC 324400FF */ andi $a0, $s2, 0xff -/* B6F890 800F86F0 0C03CE82 */ jal func_800F3A08 -/* B6F894 800F86F4 322500FF */ andi $a1, $s1, 0xff -/* B6F898 800F86F8 960C0028 */ lhu $t4, 0x28($s0) -/* B6F89C 800F86FC 3C0E8013 */ lui $t6, %hi(D_801333CC) # $t6, 0x8013 -/* B6F8A0 800F8700 24190005 */ li $t9, 5 -/* B6F8A4 800F8704 318D0C00 */ andi $t5, $t4, 0xc00 -/* B6F8A8 800F8708 11A0000A */ beqz $t5, .L800F8734 -/* B6F8AC 800F870C 3C088013 */ lui $t0, %hi(D_801333CC) # $t0, 0x8013 -/* B6F8B0 800F8710 A21E002A */ sb $fp, 0x2a($s0) -/* B6F8B4 800F8714 91CE33CC */ lbu $t6, %lo(D_801333CC)($t6) -/* B6F8B8 800F8718 3C038013 */ lui $v1, %hi(D_80130578) -/* B6F8BC 800F871C 000E78C0 */ sll $t7, $t6, 3 -/* B6F8C0 800F8720 01EE7823 */ subu $t7, $t7, $t6 -/* B6F8C4 800F8724 01F2C021 */ addu $t8, $t7, $s2 -/* B6F8C8 800F8728 00781821 */ addu $v1, $v1, $t8 -/* B6F8CC 800F872C 10000009 */ b .L800F8754 -/* B6F8D0 800F8730 90630578 */ lbu $v1, %lo(D_80130578)($v1) -.L800F8734: -/* B6F8D4 800F8734 A219002A */ sb $t9, 0x2a($s0) -/* B6F8D8 800F8738 910833CC */ lbu $t0, %lo(D_801333CC)($t0) -/* B6F8DC 800F873C 3C038013 */ lui $v1, %hi(D_80130578) -/* B6F8E0 800F8740 000848C0 */ sll $t1, $t0, 3 -/* B6F8E4 800F8744 01284823 */ subu $t1, $t1, $t0 -/* B6F8E8 800F8748 01325021 */ addu $t2, $t1, $s2 -/* B6F8EC 800F874C 006A1821 */ addu $v1, $v1, $t2 -/* B6F8F0 800F8750 90630578 */ lbu $v1, %lo(D_80130578)($v1) -.L800F8754: -/* B6F8F4 800F8754 926B0000 */ lbu $t3, ($s3) -/* B6F8F8 800F8758 26940001 */ addiu $s4, $s4, 1 -/* B6F8FC 800F875C 329400FF */ andi $s4, $s4, 0xff -/* B6F900 800F8760 0283082A */ slt $at, $s4, $v1 -/* B6F904 800F8764 256C0001 */ addiu $t4, $t3, 1 -/* B6F908 800F8768 1420FF68 */ bnez $at, .L800F850C -/* B6F90C 800F876C A26C0000 */ sb $t4, ($s3) -.L800F8770: -/* B6F910 800F8770 8FBF003C */ lw $ra, 0x3c($sp) -/* B6F914 800F8774 8FB00018 */ lw $s0, 0x18($sp) -/* B6F918 800F8778 8FB1001C */ lw $s1, 0x1c($sp) -/* B6F91C 800F877C 8FB20020 */ lw $s2, 0x20($sp) -/* B6F920 800F8780 8FB30024 */ lw $s3, 0x24($sp) -/* B6F924 800F8784 8FB40028 */ lw $s4, 0x28($sp) -/* B6F928 800F8788 8FB5002C */ lw $s5, 0x2c($sp) -/* B6F92C 800F878C 8FB60030 */ lw $s6, 0x30($sp) -/* B6F930 800F8790 8FB70034 */ lw $s7, 0x34($sp) -/* B6F934 800F8794 8FBE0038 */ lw $fp, 0x38($sp) -/* B6F938 800F8798 03E00008 */ jr $ra -/* B6F93C 800F879C 27BD0060 */ addiu $sp, $sp, 0x60 - diff --git a/asm/non_matchings/code/code_800F7260/func_800F87A0.s b/asm/non_matchings/code/code_800F7260/func_800F87A0.s deleted file mode 100644 index fdb1e581ef..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F87A0.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_800F87A0 -/* B6F940 800F87A0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* B6F944 800F87A4 AFB60030 */ sw $s6, 0x30($sp) -/* B6F948 800F87A8 309600FF */ andi $s6, $a0, 0xff -/* B6F94C 800F87AC 3C0F8013 */ lui $t7, %hi(D_801333A8) # $t7, 0x8013 -/* B6F950 800F87B0 AFB20020 */ sw $s2, 0x20($sp) -/* B6F954 800F87B4 25EF33A8 */ addiu $t7, %lo(D_801333A8) # addiu $t7, $t7, 0x33a8 -/* B6F958 800F87B8 00167080 */ sll $t6, $s6, 2 -/* B6F95C 800F87BC 01CF9021 */ addu $s2, $t6, $t7 -/* B6F960 800F87C0 8E430000 */ lw $v1, ($s2) -/* B6F964 800F87C4 AFBF0034 */ sw $ra, 0x34($sp) -/* B6F968 800F87C8 AFB5002C */ sw $s5, 0x2c($sp) -/* B6F96C 800F87CC AFB40028 */ sw $s4, 0x28($sp) -/* B6F970 800F87D0 AFB30024 */ sw $s3, 0x24($sp) -/* B6F974 800F87D4 AFB1001C */ sw $s1, 0x1c($sp) -/* B6F978 800F87D8 AFB00018 */ sw $s0, 0x18($sp) -/* B6F97C 800F87DC AFA40080 */ sw $a0, 0x80($sp) -/* B6F980 800F87E0 9071002D */ lbu $s1, 0x2d($v1) -/* B6F984 800F87E4 241300FF */ li $s3, 255 -/* B6F988 800F87E8 24140030 */ li $s4, 48 -/* B6F98C 800F87EC 12710016 */ beq $s3, $s1, .L800F8848 -/* B6F990 800F87F0 3C150602 */ lui $s5, 0x602 -.L800F87F4: -/* B6F994 800F87F4 02340019 */ multu $s1, $s4 -/* B6F998 800F87F8 0000C012 */ mflo $t8 -/* B6F99C 800F87FC 00788021 */ addu $s0, $v1, $t8 -/* B6F9A0 800F8800 9202002A */ lbu $v0, 0x2a($s0) -/* B6F9A4 800F8804 28410003 */ slti $at, $v0, 3 -/* B6F9A8 800F8808 14200007 */ bnez $at, .L800F8828 -/* B6F9AC 800F880C 00000000 */ nop -/* B6F9B0 800F8810 9208002E */ lbu $t0, 0x2e($s0) -/* B6F9B4 800F8814 00002825 */ move $a1, $zero -/* B6F9B8 800F8818 00084A00 */ sll $t1, $t0, 8 -/* B6F9BC 800F881C 0C0396C8 */ jal func_800E5B20 -/* B6F9C0 800F8820 01352025 */ or $a0, $t1, $s5 -/* B6F9C4 800F8824 9202002A */ lbu $v0, 0x2a($s0) -.L800F8828: -/* B6F9C8 800F8828 10400003 */ beqz $v0, .L800F8838 -/* B6F9CC 800F882C 32C400FF */ andi $a0, $s6, 0xff -/* B6F9D0 800F8830 0C03DED5 */ jal func_800F7B54 -/* B6F9D4 800F8834 322500FF */ andi $a1, $s1, 0xff -.L800F8838: -/* B6F9D8 800F8838 8E430000 */ lw $v1, ($s2) -/* B6F9DC 800F883C 9071002D */ lbu $s1, 0x2d($v1) -/* B6F9E0 800F8840 1671FFEC */ bne $s3, $s1, .L800F87F4 -/* B6F9E4 800F8844 00000000 */ nop -.L800F8848: -/* B6F9E8 800F8848 00165300 */ sll $t2, $s6, 0xc -/* B6F9EC 800F884C A7AA0070 */ sh $t2, 0x70($sp) -/* B6F9F0 800F8850 00002025 */ move $a0, $zero -/* B6F9F4 800F8854 0C03DD38 */ jal func_800F74E0 -/* B6F9F8 800F8858 27A50048 */ addiu $a1, $sp, 0x48 -/* B6F9FC 800F885C 8FBF0034 */ lw $ra, 0x34($sp) -/* B6FA00 800F8860 8FB00018 */ lw $s0, 0x18($sp) -/* B6FA04 800F8864 8FB1001C */ lw $s1, 0x1c($sp) -/* B6FA08 800F8868 8FB20020 */ lw $s2, 0x20($sp) -/* B6FA0C 800F886C 8FB30024 */ lw $s3, 0x24($sp) -/* B6FA10 800F8870 8FB40028 */ lw $s4, 0x28($sp) -/* B6FA14 800F8874 8FB5002C */ lw $s5, 0x2c($sp) -/* B6FA18 800F8878 8FB60030 */ lw $s6, 0x30($sp) -/* B6FA1C 800F887C 03E00008 */ jr $ra -/* B6FA20 800F8880 27BD0080 */ addiu $sp, $sp, 0x80 - diff --git a/asm/non_matchings/code/code_800F7260/func_800F8884.s b/asm/non_matchings/code/code_800F7260/func_800F8884.s deleted file mode 100644 index 5edce5c19b..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8884.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_800F8884 -/* B6FA24 800F8884 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B6FA28 800F8888 AFB5002C */ sw $s5, 0x2c($sp) -/* B6FA2C 800F888C 309500FF */ andi $s5, $a0, 0xff -/* B6FA30 800F8890 3C0F8013 */ lui $t7, %hi(D_801333A8) # $t7, 0x8013 -/* B6FA34 800F8894 AFB40028 */ sw $s4, 0x28($sp) -/* B6FA38 800F8898 25EF33A8 */ addiu $t7, %lo(D_801333A8) # addiu $t7, $t7, 0x33a8 -/* B6FA3C 800F889C 00157080 */ sll $t6, $s5, 2 -/* B6FA40 800F88A0 01CFA021 */ addu $s4, $t6, $t7 -/* B6FA44 800F88A4 8E820000 */ lw $v0, ($s4) -/* B6FA48 800F88A8 AFBF003C */ sw $ra, 0x3c($sp) -/* B6FA4C 800F88AC AFBE0038 */ sw $fp, 0x38($sp) -/* B6FA50 800F88B0 AFB70034 */ sw $s7, 0x34($sp) -/* B6FA54 800F88B4 AFB60030 */ sw $s6, 0x30($sp) -/* B6FA58 800F88B8 AFB30024 */ sw $s3, 0x24($sp) -/* B6FA5C 800F88BC AFB20020 */ sw $s2, 0x20($sp) -/* B6FA60 800F88C0 AFB1001C */ sw $s1, 0x1c($sp) -/* B6FA64 800F88C4 AFB00018 */ sw $s0, 0x18($sp) -/* B6FA68 800F88C8 AFA40040 */ sw $a0, 0x40($sp) -/* B6FA6C 800F88CC 9051002D */ lbu $s1, 0x2d($v0) -/* B6FA70 800F88D0 241700FF */ li $s7, 255 -/* B6FA74 800F88D4 00A0B025 */ move $s6, $a1 -/* B6FA78 800F88D8 12F10025 */ beq $s7, $s1, .L800F8970 -/* B6FA7C 800F88DC 00009025 */ move $s2, $zero -/* B6FA80 800F88E0 241E0030 */ li $fp, 48 -.L800F88E4: -/* B6FA84 800F88E4 023E0019 */ multu $s1, $fp -/* B6FA88 800F88E8 0000C012 */ mflo $t8 -/* B6FA8C 800F88EC 00588021 */ addu $s0, $v0, $t8 -/* B6FA90 800F88F0 8E190000 */ lw $t9, ($s0) -/* B6FA94 800F88F4 56D90017 */ bnel $s6, $t9, .L800F8954 -/* B6FA98 800F88F8 323200FF */ andi $s2, $s1, 0xff -/* B6FA9C 800F88FC 9202002A */ lbu $v0, 0x2a($s0) -/* B6FAA0 800F8900 00129880 */ sll $s3, $s2, 2 -/* B6FAA4 800F8904 02729823 */ subu $s3, $s3, $s2 -/* B6FAA8 800F8908 28410003 */ slti $at, $v0, 3 -/* B6FAAC 800F890C 14200008 */ bnez $at, .L800F8930 -/* B6FAB0 800F8910 00139900 */ sll $s3, $s3, 4 -/* B6FAB4 800F8914 9204002E */ lbu $a0, 0x2e($s0) -/* B6FAB8 800F8918 3C010602 */ lui $at, 0x602 -/* B6FABC 800F891C 00002825 */ move $a1, $zero -/* B6FAC0 800F8920 00042200 */ sll $a0, $a0, 8 -/* B6FAC4 800F8924 0C0396C8 */ jal func_800E5B20 -/* B6FAC8 800F8928 00812025 */ or $a0, $a0, $at -/* B6FACC 800F892C 9202002A */ lbu $v0, 0x2a($s0) -.L800F8930: -/* B6FAD0 800F8930 10400003 */ beqz $v0, .L800F8940 -/* B6FAD4 800F8934 32A400FF */ andi $a0, $s5, 0xff -/* B6FAD8 800F8938 0C03DED5 */ jal func_800F7B54 -/* B6FADC 800F893C 322500FF */ andi $a1, $s1, 0xff -.L800F8940: -/* B6FAE0 800F8940 8E820000 */ lw $v0, ($s4) -/* B6FAE4 800F8944 00534021 */ addu $t0, $v0, $s3 -/* B6FAE8 800F8948 10000007 */ b .L800F8968 -/* B6FAEC 800F894C 9111002D */ lbu $s1, 0x2d($t0) -/* B6FAF0 800F8950 323200FF */ andi $s2, $s1, 0xff -.L800F8954: -/* B6FAF4 800F8954 00124880 */ sll $t1, $s2, 2 -/* B6FAF8 800F8958 01324823 */ subu $t1, $t1, $s2 -/* B6FAFC 800F895C 00094900 */ sll $t1, $t1, 4 -/* B6FB00 800F8960 00495021 */ addu $t2, $v0, $t1 -/* B6FB04 800F8964 9151002D */ lbu $s1, 0x2d($t2) -.L800F8968: -/* B6FB08 800F8968 16F1FFDE */ bne $s7, $s1, .L800F88E4 -/* B6FB0C 800F896C 00000000 */ nop -.L800F8970: -/* B6FB10 800F8970 8FBF003C */ lw $ra, 0x3c($sp) -/* B6FB14 800F8974 8FB00018 */ lw $s0, 0x18($sp) -/* B6FB18 800F8978 8FB1001C */ lw $s1, 0x1c($sp) -/* B6FB1C 800F897C 8FB20020 */ lw $s2, 0x20($sp) -/* B6FB20 800F8980 8FB30024 */ lw $s3, 0x24($sp) -/* B6FB24 800F8984 8FB40028 */ lw $s4, 0x28($sp) -/* B6FB28 800F8988 8FB5002C */ lw $s5, 0x2c($sp) -/* B6FB2C 800F898C 8FB60030 */ lw $s6, 0x30($sp) -/* B6FB30 800F8990 8FB70034 */ lw $s7, 0x34($sp) -/* B6FB34 800F8994 8FBE0038 */ lw $fp, 0x38($sp) -/* B6FB38 800F8998 03E00008 */ jr $ra -/* B6FB3C 800F899C 27BD0040 */ addiu $sp, $sp, 0x40 - -/* B6FB40 800F89A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B6FB44 800F89A4 AFBF0014 */ sw $ra, 0x14($sp) -/* B6FB48 800F89A8 AFA40048 */ sw $a0, 0x48($sp) -/* B6FB4C 800F89AC AFA5004C */ sw $a1, 0x4c($sp) -/* B6FB50 800F89B0 0C03E221 */ jal func_800F8884 -/* B6FB54 800F89B4 93A4004B */ lbu $a0, 0x4b($sp) -/* B6FB58 800F89B8 93AE004B */ lbu $t6, 0x4b($sp) -/* B6FB5C 800F89BC 8FB8004C */ lw $t8, 0x4c($sp) -/* B6FB60 800F89C0 24040001 */ li $a0, 1 -/* B6FB64 800F89C4 000E7B00 */ sll $t7, $t6, 0xc -/* B6FB68 800F89C8 A7AF0040 */ sh $t7, 0x40($sp) -/* B6FB6C 800F89CC 27A50018 */ addiu $a1, $sp, 0x18 -/* B6FB70 800F89D0 0C03DD38 */ jal func_800F74E0 -/* B6FB74 800F89D4 AFB80018 */ sw $t8, 0x18($sp) -/* B6FB78 800F89D8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6FB7C 800F89DC 27BD0048 */ addiu $sp, $sp, 0x48 -/* B6FB80 800F89E0 03E00008 */ jr $ra -/* B6FB84 800F89E4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F89E8.s b/asm/non_matchings/code/code_800F7260/func_800F89E8.s deleted file mode 100644 index 355a1ce588..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F89E8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800F89E8 -/* B6FB88 800F89E8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B6FB8C 800F89EC AFB10018 */ sw $s1, 0x18($sp) -/* B6FB90 800F89F0 AFB00014 */ sw $s0, 0x14($sp) -/* B6FB94 800F89F4 00808825 */ move $s1, $a0 -/* B6FB98 800F89F8 AFBF001C */ sw $ra, 0x1c($sp) -/* B6FB9C 800F89FC 00008025 */ move $s0, $zero -/* B6FBA0 800F8A00 320400FF */ andi $a0, $s0, 0xff -.L800F8A04: -/* B6FBA4 800F8A04 0C03E221 */ jal func_800F8884 -/* B6FBA8 800F8A08 02202825 */ move $a1, $s1 -/* B6FBAC 800F8A0C 26100001 */ addiu $s0, $s0, 1 -/* B6FBB0 800F8A10 321000FF */ andi $s0, $s0, 0xff -/* B6FBB4 800F8A14 2A010007 */ slti $at, $s0, 7 -/* B6FBB8 800F8A18 5420FFFA */ bnezl $at, .L800F8A04 -/* B6FBBC 800F8A1C 320400FF */ andi $a0, $s0, 0xff -/* B6FBC0 800F8A20 AFB10024 */ sw $s1, 0x24($sp) -/* B6FBC4 800F8A24 24040002 */ li $a0, 2 -/* B6FBC8 800F8A28 0C03DD38 */ jal func_800F74E0 -/* B6FBCC 800F8A2C 27A50024 */ addiu $a1, $sp, 0x24 -/* B6FBD0 800F8A30 8FBF001C */ lw $ra, 0x1c($sp) -/* B6FBD4 800F8A34 8FB00014 */ lw $s0, 0x14($sp) -/* B6FBD8 800F8A38 8FB10018 */ lw $s1, 0x18($sp) -/* B6FBDC 800F8A3C 03E00008 */ jr $ra -/* B6FBE0 800F8A40 27BD0058 */ addiu $sp, $sp, 0x58 - diff --git a/asm/non_matchings/code/code_800F7260/func_800F8A44.s b/asm/non_matchings/code/code_800F7260/func_800F8A44.s deleted file mode 100644 index bfb8479799..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8A44.s +++ /dev/null @@ -1,190 +0,0 @@ -glabel func_800F8A44 -/* B6FBE4 800F8A44 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B6FBE8 800F8A48 AFB70034 */ sw $s7, 0x34($sp) -/* B6FBEC 800F8A4C AFA5008C */ sw $a1, 0x8c($sp) -/* B6FBF0 800F8A50 97B7008E */ lhu $s7, 0x8e($sp) -/* B6FBF4 800F8A54 AFBE0038 */ sw $fp, 0x38($sp) -/* B6FBF8 800F8A58 3C0F8013 */ lui $t7, %hi(D_801333A8) # $t7, 0x8013 -/* B6FBFC 800F8A5C 32FEF000 */ andi $fp, $s7, 0xf000 -/* B6FC00 800F8A60 001EF303 */ sra $fp, $fp, 0xc -/* B6FC04 800F8A64 33DE00FF */ andi $fp, $fp, 0xff -/* B6FC08 800F8A68 AFB30024 */ sw $s3, 0x24($sp) -/* B6FC0C 800F8A6C 001E7080 */ sll $t6, $fp, 2 -/* B6FC10 800F8A70 25EF33A8 */ addiu $t7, %lo(D_801333A8) # addiu $t7, $t7, 0x33a8 -/* B6FC14 800F8A74 01CF9821 */ addu $s3, $t6, $t7 -/* B6FC18 800F8A78 8E780000 */ lw $t8, ($s3) -/* B6FC1C 800F8A7C AFBF003C */ sw $ra, 0x3c($sp) -/* B6FC20 800F8A80 AFB60030 */ sw $s6, 0x30($sp) -/* B6FC24 800F8A84 AFB5002C */ sw $s5, 0x2c($sp) -/* B6FC28 800F8A88 AFB40028 */ sw $s4, 0x28($sp) -/* B6FC2C 800F8A8C AFB20020 */ sw $s2, 0x20($sp) -/* B6FC30 800F8A90 AFB1001C */ sw $s1, 0x1c($sp) -/* B6FC34 800F8A94 AFB00018 */ sw $s0, 0x18($sp) -/* B6FC38 800F8A98 AFA40088 */ sw $a0, 0x88($sp) -/* B6FC3C 800F8A9C 9311002D */ lbu $s1, 0x2d($t8) -/* B6FC40 800F8AA0 241500FF */ li $s5, 255 -/* B6FC44 800F8AA4 0000A025 */ move $s4, $zero -/* B6FC48 800F8AA8 12B1002A */ beq $s5, $s1, .L800F8B54 -/* B6FC4C 800F8AAC 02201025 */ move $v0, $s1 -/* B6FC50 800F8AB0 3C160602 */ lui $s6, 0x602 -/* B6FC54 800F8AB4 24120030 */ li $s2, 48 -.L800F8AB8: -/* B6FC58 800F8AB8 02320019 */ multu $s1, $s2 -/* B6FC5C 800F8ABC 8E790000 */ lw $t9, ($s3) -/* B6FC60 800F8AC0 8FA90088 */ lw $t1, 0x88($sp) -/* B6FC64 800F8AC4 00004012 */ mflo $t0 -/* B6FC68 800F8AC8 03288021 */ addu $s0, $t9, $t0 -/* B6FC6C 800F8ACC 8E0A0000 */ lw $t2, ($s0) -/* B6FC70 800F8AD0 552A0016 */ bnel $t1, $t2, .L800F8B2C -/* B6FC74 800F8AD4 323400FF */ andi $s4, $s1, 0xff -/* B6FC78 800F8AD8 960B0028 */ lhu $t3, 0x28($s0) -/* B6FC7C 800F8ADC 56EB0013 */ bnel $s7, $t3, .L800F8B2C -/* B6FC80 800F8AE0 323400FF */ andi $s4, $s1, 0xff -/* B6FC84 800F8AE4 9202002A */ lbu $v0, 0x2a($s0) -/* B6FC88 800F8AE8 28410003 */ slti $at, $v0, 3 -/* B6FC8C 800F8AEC 14200007 */ bnez $at, .L800F8B0C -/* B6FC90 800F8AF0 00000000 */ nop -/* B6FC94 800F8AF4 920D002E */ lbu $t5, 0x2e($s0) -/* B6FC98 800F8AF8 00002825 */ move $a1, $zero -/* B6FC9C 800F8AFC 000D7200 */ sll $t6, $t5, 8 -/* B6FCA0 800F8B00 0C0396C8 */ jal func_800E5B20 -/* B6FCA4 800F8B04 01D62025 */ or $a0, $t6, $s6 -/* B6FCA8 800F8B08 9202002A */ lbu $v0, 0x2a($s0) -.L800F8B0C: -/* B6FCAC 800F8B0C 10400003 */ beqz $v0, .L800F8B1C -/* B6FCB0 800F8B10 33C400FF */ andi $a0, $fp, 0xff -/* B6FCB4 800F8B14 0C03DED5 */ jal func_800F7B54 -/* B6FCB8 800F8B18 322500FF */ andi $a1, $s1, 0xff -.L800F8B1C: -/* B6FCBC 800F8B1C 241100FF */ li $s1, 255 -/* B6FCC0 800F8B20 10000002 */ b .L800F8B2C -/* B6FCC4 800F8B24 240200FF */ li $v0, 255 -/* B6FCC8 800F8B28 323400FF */ andi $s4, $s1, 0xff -.L800F8B2C: -/* B6FCCC 800F8B2C 12A20007 */ beq $s5, $v0, .L800F8B4C -/* B6FCD0 800F8B30 00000000 */ nop -/* B6FCD4 800F8B34 02920019 */ multu $s4, $s2 -/* B6FCD8 800F8B38 8E6F0000 */ lw $t7, ($s3) -/* B6FCDC 800F8B3C 0000C012 */ mflo $t8 -/* B6FCE0 800F8B40 01F8C821 */ addu $t9, $t7, $t8 -/* B6FCE4 800F8B44 9331002D */ lbu $s1, 0x2d($t9) -/* B6FCE8 800F8B48 02201025 */ move $v0, $s1 -.L800F8B4C: -/* B6FCEC 800F8B4C 16A2FFDA */ bne $s5, $v0, .L800F8AB8 -/* B6FCF0 800F8B50 00000000 */ nop -.L800F8B54: -/* B6FCF4 800F8B54 8FA80088 */ lw $t0, 0x88($sp) -/* B6FCF8 800F8B58 97A9008E */ lhu $t1, 0x8e($sp) -/* B6FCFC 800F8B5C 24040003 */ li $a0, 3 -/* B6FD00 800F8B60 27A50050 */ addiu $a1, $sp, 0x50 -/* B6FD04 800F8B64 AFA80050 */ sw $t0, 0x50($sp) -/* B6FD08 800F8B68 0C03DD38 */ jal func_800F74E0 -/* B6FD0C 800F8B6C A7A90078 */ sh $t1, 0x78($sp) -/* B6FD10 800F8B70 8FBF003C */ lw $ra, 0x3c($sp) -/* B6FD14 800F8B74 8FB00018 */ lw $s0, 0x18($sp) -/* B6FD18 800F8B78 8FB1001C */ lw $s1, 0x1c($sp) -/* B6FD1C 800F8B7C 8FB20020 */ lw $s2, 0x20($sp) -/* B6FD20 800F8B80 8FB30024 */ lw $s3, 0x24($sp) -/* B6FD24 800F8B84 8FB40028 */ lw $s4, 0x28($sp) -/* B6FD28 800F8B88 8FB5002C */ lw $s5, 0x2c($sp) -/* B6FD2C 800F8B8C 8FB60030 */ lw $s6, 0x30($sp) -/* B6FD30 800F8B90 8FB70034 */ lw $s7, 0x34($sp) -/* B6FD34 800F8B94 8FBE0038 */ lw $fp, 0x38($sp) -/* B6FD38 800F8B98 03E00008 */ jr $ra -/* B6FD3C 800F8B9C 27BD0088 */ addiu $sp, $sp, 0x88 - -/* B6FD40 800F8BA0 27BDFF70 */ addiu $sp, $sp, -0x90 -/* B6FD44 800F8BA4 AFBE0038 */ sw $fp, 0x38($sp) -/* B6FD48 800F8BA8 AFA50094 */ sw $a1, 0x94($sp) -/* B6FD4C 800F8BAC 97BE0096 */ lhu $fp, 0x96($sp) -/* B6FD50 800F8BB0 3C088013 */ lui $t0, %hi(D_801333A8) # $t0, 0x8013 -/* B6FD54 800F8BB4 AFB40028 */ sw $s4, 0x28($sp) -/* B6FD58 800F8BB8 33CEF000 */ andi $t6, $fp, 0xf000 -/* B6FD5C 800F8BBC 000E7B03 */ sra $t7, $t6, 0xc -/* B6FD60 800F8BC0 31F800FF */ andi $t8, $t7, 0xff -/* B6FD64 800F8BC4 0018C880 */ sll $t9, $t8, 2 -/* B6FD68 800F8BC8 250833A8 */ addiu $t0, %lo(D_801333A8) # addiu $t0, $t0, 0x33a8 -/* B6FD6C 800F8BCC 0328A021 */ addu $s4, $t9, $t0 -/* B6FD70 800F8BD0 8E890000 */ lw $t1, ($s4) -/* B6FD74 800F8BD4 AFBF003C */ sw $ra, 0x3c($sp) -/* B6FD78 800F8BD8 AFB70034 */ sw $s7, 0x34($sp) -/* B6FD7C 800F8BDC AFB60030 */ sw $s6, 0x30($sp) -/* B6FD80 800F8BE0 AFB5002C */ sw $s5, 0x2c($sp) -/* B6FD84 800F8BE4 AFB30024 */ sw $s3, 0x24($sp) -/* B6FD88 800F8BE8 AFB20020 */ sw $s2, 0x20($sp) -/* B6FD8C 800F8BEC AFB1001C */ sw $s1, 0x1c($sp) -/* B6FD90 800F8BF0 AFB00018 */ sw $s0, 0x18($sp) -/* B6FD94 800F8BF4 AFA40090 */ sw $a0, 0x90($sp) -/* B6FD98 800F8BF8 AFB80050 */ sw $t8, 0x50($sp) -/* B6FD9C 800F8BFC 9131002D */ lbu $s1, 0x2d($t1) -/* B6FDA0 800F8C00 241600FF */ li $s6, 255 -/* B6FDA4 800F8C04 0000A825 */ move $s5, $zero -/* B6FDA8 800F8C08 12D1002B */ beq $s6, $s1, .L800F8CB8 -/* B6FDAC 800F8C0C 02209025 */ move $s2, $s1 -/* B6FDB0 800F8C10 93AA0093 */ lbu $t2, 0x93($sp) -/* B6FDB4 800F8C14 3C170602 */ lui $s7, 0x602 -/* B6FDB8 800F8C18 24130030 */ li $s3, 48 -/* B6FDBC 800F8C1C AFAA0044 */ sw $t2, 0x44($sp) -.L800F8C20: -/* B6FDC0 800F8C20 02330019 */ multu $s1, $s3 -/* B6FDC4 800F8C24 8E8B0000 */ lw $t3, ($s4) -/* B6FDC8 800F8C28 8FAD0044 */ lw $t5, 0x44($sp) -/* B6FDCC 800F8C2C 00006012 */ mflo $t4 -/* B6FDD0 800F8C30 016C8021 */ addu $s0, $t3, $t4 -/* B6FDD4 800F8C34 920E000C */ lbu $t6, 0xc($s0) -/* B6FDD8 800F8C38 55AE0015 */ bnel $t5, $t6, .L800F8C90 -/* B6FDDC 800F8C3C 323500FF */ andi $s5, $s1, 0xff -/* B6FDE0 800F8C40 960F0028 */ lhu $t7, 0x28($s0) -/* B6FDE4 800F8C44 57CF0012 */ bnel $fp, $t7, .L800F8C90 -/* B6FDE8 800F8C48 323500FF */ andi $s5, $s1, 0xff -/* B6FDEC 800F8C4C 9202002A */ lbu $v0, 0x2a($s0) -/* B6FDF0 800F8C50 28410003 */ slti $at, $v0, 3 -/* B6FDF4 800F8C54 14200007 */ bnez $at, .L800F8C74 -/* B6FDF8 800F8C58 00000000 */ nop -/* B6FDFC 800F8C5C 9219002E */ lbu $t9, 0x2e($s0) -/* B6FE00 800F8C60 00002825 */ move $a1, $zero -/* B6FE04 800F8C64 00194200 */ sll $t0, $t9, 8 -/* B6FE08 800F8C68 0C0396C8 */ jal func_800E5B20 -/* B6FE0C 800F8C6C 01172025 */ or $a0, $t0, $s7 -/* B6FE10 800F8C70 9202002A */ lbu $v0, 0x2a($s0) -.L800F8C74: -/* B6FE14 800F8C74 10400006 */ beqz $v0, .L800F8C90 -/* B6FE18 800F8C78 93A40053 */ lbu $a0, 0x53($sp) -/* B6FE1C 800F8C7C 0C03DED5 */ jal func_800F7B54 -/* B6FE20 800F8C80 322500FF */ andi $a1, $s1, 0xff -/* B6FE24 800F8C84 10000002 */ b .L800F8C90 -/* B6FE28 800F8C88 00000000 */ nop -/* B6FE2C 800F8C8C 323500FF */ andi $s5, $s1, 0xff -.L800F8C90: -/* B6FE30 800F8C90 12D20007 */ beq $s6, $s2, .L800F8CB0 -/* B6FE34 800F8C94 00000000 */ nop -/* B6FE38 800F8C98 02B30019 */ multu $s5, $s3 -/* B6FE3C 800F8C9C 8E890000 */ lw $t1, ($s4) -/* B6FE40 800F8CA0 00005012 */ mflo $t2 -/* B6FE44 800F8CA4 012A5821 */ addu $t3, $t1, $t2 -/* B6FE48 800F8CA8 9171002D */ lbu $s1, 0x2d($t3) -/* B6FE4C 800F8CAC 02209025 */ move $s2, $s1 -.L800F8CB0: -/* B6FE50 800F8CB0 16D2FFDB */ bne $s6, $s2, .L800F8C20 -/* B6FE54 800F8CB4 00000000 */ nop -.L800F8CB8: -/* B6FE58 800F8CB8 93AC0093 */ lbu $t4, 0x93($sp) -/* B6FE5C 800F8CBC 97AD0096 */ lhu $t5, 0x96($sp) -/* B6FE60 800F8CC0 24040004 */ li $a0, 4 -/* B6FE64 800F8CC4 27A50058 */ addiu $a1, $sp, 0x58 -/* B6FE68 800F8CC8 A3AC0064 */ sb $t4, 0x64($sp) -/* B6FE6C 800F8CCC 0C03DD38 */ jal func_800F74E0 -/* B6FE70 800F8CD0 A7AD0080 */ sh $t5, 0x80($sp) -/* B6FE74 800F8CD4 8FBF003C */ lw $ra, 0x3c($sp) -/* B6FE78 800F8CD8 8FB00018 */ lw $s0, 0x18($sp) -/* B6FE7C 800F8CDC 8FB1001C */ lw $s1, 0x1c($sp) -/* B6FE80 800F8CE0 8FB20020 */ lw $s2, 0x20($sp) -/* B6FE84 800F8CE4 8FB30024 */ lw $s3, 0x24($sp) -/* B6FE88 800F8CE8 8FB40028 */ lw $s4, 0x28($sp) -/* B6FE8C 800F8CEC 8FB5002C */ lw $s5, 0x2c($sp) -/* B6FE90 800F8CF0 8FB60030 */ lw $s6, 0x30($sp) -/* B6FE94 800F8CF4 8FB70034 */ lw $s7, 0x34($sp) -/* B6FE98 800F8CF8 8FBE0038 */ lw $fp, 0x38($sp) -/* B6FE9C 800F8CFC 03E00008 */ jr $ra -/* B6FEA0 800F8D00 27BD0090 */ addiu $sp, $sp, 0x90 - diff --git a/asm/non_matchings/code/code_800F7260/func_800F8D04.s b/asm/non_matchings/code/code_800F7260/func_800F8D04.s deleted file mode 100644 index 429009499e..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8D04.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_800F8D04 -/* B6FEA4 800F8D04 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B6FEA8 800F8D08 AFB40028 */ sw $s4, 0x28($sp) -/* B6FEAC 800F8D0C 3094F000 */ andi $s4, $a0, 0xf000 -/* B6FEB0 800F8D10 0014A302 */ srl $s4, $s4, 0xc -/* B6FEB4 800F8D14 329400FF */ andi $s4, $s4, 0xff -/* B6FEB8 800F8D18 3C0F8013 */ lui $t7, %hi(D_801333A8) # $t7, 0x8013 -/* B6FEBC 800F8D1C AFB5002C */ sw $s5, 0x2c($sp) -/* B6FEC0 800F8D20 25EF33A8 */ addiu $t7, %lo(D_801333A8) # addiu $t7, $t7, 0x33a8 -/* B6FEC4 800F8D24 00147080 */ sll $t6, $s4, 2 -/* B6FEC8 800F8D28 01CFA821 */ addu $s5, $t6, $t7 -/* B6FECC 800F8D2C 8EA20000 */ lw $v0, ($s5) -/* B6FED0 800F8D30 AFBF003C */ sw $ra, 0x3c($sp) -/* B6FED4 800F8D34 AFBE0038 */ sw $fp, 0x38($sp) -/* B6FED8 800F8D38 AFB70034 */ sw $s7, 0x34($sp) -/* B6FEDC 800F8D3C AFB60030 */ sw $s6, 0x30($sp) -/* B6FEE0 800F8D40 AFB30024 */ sw $s3, 0x24($sp) -/* B6FEE4 800F8D44 AFB20020 */ sw $s2, 0x20($sp) -/* B6FEE8 800F8D48 AFB1001C */ sw $s1, 0x1c($sp) -/* B6FEEC 800F8D4C AFB00018 */ sw $s0, 0x18($sp) -/* B6FEF0 800F8D50 AFA40088 */ sw $a0, 0x88($sp) -/* B6FEF4 800F8D54 9051002D */ lbu $s1, 0x2d($v0) -/* B6FEF8 800F8D58 241600FF */ li $s6, 255 -/* B6FEFC 800F8D5C 00009025 */ move $s2, $zero -/* B6FF00 800F8D60 12D10025 */ beq $s6, $s1, .L800F8DF8 -/* B6FF04 800F8D64 24170030 */ li $s7, 48 -/* B6FF08 800F8D68 3C1E0602 */ lui $fp, 0x602 -.L800F8D6C: -/* B6FF0C 800F8D6C 02370019 */ multu $s1, $s7 -/* B6FF10 800F8D70 8FB90088 */ lw $t9, 0x88($sp) -/* B6FF14 800F8D74 0000C012 */ mflo $t8 -/* B6FF18 800F8D78 00588021 */ addu $s0, $v0, $t8 -/* B6FF1C 800F8D7C 96080028 */ lhu $t0, 0x28($s0) -/* B6FF20 800F8D80 57280016 */ bnel $t9, $t0, .L800F8DDC -/* B6FF24 800F8D84 323200FF */ andi $s2, $s1, 0xff -/* B6FF28 800F8D88 9202002A */ lbu $v0, 0x2a($s0) -/* B6FF2C 800F8D8C 00129880 */ sll $s3, $s2, 2 -/* B6FF30 800F8D90 02729823 */ subu $s3, $s3, $s2 -/* B6FF34 800F8D94 28410003 */ slti $at, $v0, 3 -/* B6FF38 800F8D98 14200007 */ bnez $at, .L800F8DB8 -/* B6FF3C 800F8D9C 00139900 */ sll $s3, $s3, 4 -/* B6FF40 800F8DA0 920A002E */ lbu $t2, 0x2e($s0) -/* B6FF44 800F8DA4 00002825 */ move $a1, $zero -/* B6FF48 800F8DA8 000A5A00 */ sll $t3, $t2, 8 -/* B6FF4C 800F8DAC 0C0396C8 */ jal func_800E5B20 -/* B6FF50 800F8DB0 017E2025 */ or $a0, $t3, $fp -/* B6FF54 800F8DB4 9202002A */ lbu $v0, 0x2a($s0) -.L800F8DB8: -/* B6FF58 800F8DB8 10400003 */ beqz $v0, .L800F8DC8 -/* B6FF5C 800F8DBC 328400FF */ andi $a0, $s4, 0xff -/* B6FF60 800F8DC0 0C03DED5 */ jal func_800F7B54 -/* B6FF64 800F8DC4 322500FF */ andi $a1, $s1, 0xff -.L800F8DC8: -/* B6FF68 800F8DC8 8EA20000 */ lw $v0, ($s5) -/* B6FF6C 800F8DCC 00536021 */ addu $t4, $v0, $s3 -/* B6FF70 800F8DD0 10000007 */ b .L800F8DF0 -/* B6FF74 800F8DD4 9191002D */ lbu $s1, 0x2d($t4) -/* B6FF78 800F8DD8 323200FF */ andi $s2, $s1, 0xff -.L800F8DDC: -/* B6FF7C 800F8DDC 00126880 */ sll $t5, $s2, 2 -/* B6FF80 800F8DE0 01B26823 */ subu $t5, $t5, $s2 -/* B6FF84 800F8DE4 000D6900 */ sll $t5, $t5, 4 -/* B6FF88 800F8DE8 004D7021 */ addu $t6, $v0, $t5 -/* B6FF8C 800F8DEC 91D1002D */ lbu $s1, 0x2d($t6) -.L800F8DF0: -/* B6FF90 800F8DF0 16D1FFDE */ bne $s6, $s1, .L800F8D6C -/* B6FF94 800F8DF4 00000000 */ nop -.L800F8DF8: -/* B6FF98 800F8DF8 8FAF0088 */ lw $t7, 0x88($sp) -/* B6FF9C 800F8DFC 24040005 */ li $a0, 5 -/* B6FFA0 800F8E00 27A50050 */ addiu $a1, $sp, 0x50 -/* B6FFA4 800F8E04 0C03DD38 */ jal func_800F74E0 -/* B6FFA8 800F8E08 A7AF0078 */ sh $t7, 0x78($sp) -/* B6FFAC 800F8E0C 8FBF003C */ lw $ra, 0x3c($sp) -/* B6FFB0 800F8E10 8FB00018 */ lw $s0, 0x18($sp) -/* B6FFB4 800F8E14 8FB1001C */ lw $s1, 0x1c($sp) -/* B6FFB8 800F8E18 8FB20020 */ lw $s2, 0x20($sp) -/* B6FFBC 800F8E1C 8FB30024 */ lw $s3, 0x24($sp) -/* B6FFC0 800F8E20 8FB40028 */ lw $s4, 0x28($sp) -/* B6FFC4 800F8E24 8FB5002C */ lw $s5, 0x2c($sp) -/* B6FFC8 800F8E28 8FB60030 */ lw $s6, 0x30($sp) -/* B6FFCC 800F8E2C 8FB70034 */ lw $s7, 0x34($sp) -/* B6FFD0 800F8E30 8FBE0038 */ lw $fp, 0x38($sp) -/* B6FFD4 800F8E34 03E00008 */ jr $ra -/* B6FFD8 800F8E38 27BD0088 */ addiu $sp, $sp, 0x88 - diff --git a/asm/non_matchings/code/code_800F7260/func_800F8E3C.s b/asm/non_matchings/code/code_800F7260/func_800F8E3C.s deleted file mode 100644 index 5779a6eaba..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8E3C.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_800F8E3C -/* B6FFDC 800F8E3C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6FFE0 800F8E40 AFB10018 */ sw $s1, 0x18($sp) -/* B6FFE4 800F8E44 AFB00014 */ sw $s0, 0x14($sp) -/* B6FFE8 800F8E48 3C108013 */ lui $s0, %hi(D_801333A4) # $s0, 0x8013 -/* B6FFEC 800F8E4C 3C118013 */ lui $s1, %hi(D_801333A0) # $s1, 0x8013 -/* B6FFF0 800F8E50 263133A0 */ addiu $s1, %lo(D_801333A0) # addiu $s1, $s1, 0x33a0 -/* B6FFF4 800F8E54 261033A4 */ addiu $s0, %lo(D_801333A4) # addiu $s0, $s0, 0x33a4 -/* B6FFF8 800F8E58 920E0000 */ lbu $t6, ($s0) -/* B6FFFC 800F8E5C 922F0000 */ lbu $t7, ($s1) -/* B70000 800F8E60 AFBF001C */ sw $ra, 0x1c($sp) -/* B70004 800F8E64 51CF000A */ beql $t6, $t7, .L800F8E90 -/* B70008 800F8E68 8FBF001C */ lw $ra, 0x1c($sp) -.L800F8E6C: -/* B7000C 800F8E6C 0C03DDA0 */ jal func_800F7680 -/* B70010 800F8E70 00000000 */ nop -/* B70014 800F8E74 92180000 */ lbu $t8, ($s0) -/* B70018 800F8E78 92290000 */ lbu $t1, ($s1) -/* B7001C 800F8E7C 27190001 */ addiu $t9, $t8, 1 -/* B70020 800F8E80 332800FF */ andi $t0, $t9, 0xff -/* B70024 800F8E84 1509FFF9 */ bne $t0, $t1, .L800F8E6C -/* B70028 800F8E88 A2190000 */ sb $t9, ($s0) -/* B7002C 800F8E8C 8FBF001C */ lw $ra, 0x1c($sp) -.L800F8E90: -/* B70030 800F8E90 8FB00014 */ lw $s0, 0x14($sp) -/* B70034 800F8E94 8FB10018 */ lw $s1, 0x18($sp) -/* B70038 800F8E98 03E00008 */ jr $ra -/* B7003C 800F8E9C 27BD0020 */ addiu $sp, $sp, 0x20 - -/* B70040 800F8EA0 AFA60008 */ sw $a2, 8($sp) -/* B70044 800F8EA4 30C6FFFF */ andi $a2, $a2, 0xffff -/* B70048 800F8EA8 AFA40000 */ sw $a0, ($sp) -/* B7004C 800F8EAC AFA50004 */ sw $a1, 4($sp) -/* B70050 800F8EB0 30A500FF */ andi $a1, $a1, 0xff -/* B70054 800F8EB4 14C00003 */ bnez $a2, .L800F8EC4 -/* B70058 800F8EB8 308400FF */ andi $a0, $a0, 0xff -/* B7005C 800F8EBC 24C60001 */ addiu $a2, $a2, 1 -/* B70060 800F8EC0 30C6FFFF */ andi $a2, $a2, 0xffff -.L800F8EC4: -/* B70064 800F8EC4 44852000 */ mtc1 $a1, $f4 -/* B70068 800F8EC8 3C0F8017 */ lui $t7, %hi(D_8016E270) -/* B7006C 800F8ECC 25EFE270 */ addiu $t7, %lo(D_8016E270) # addiu $t7, $t7, -0x1d90 -/* B70070 800F8ED0 00047100 */ sll $t6, $a0, 4 -/* B70074 800F8ED4 01CF1021 */ addu $v0, $t6, $t7 -/* B70078 800F8ED8 04A10005 */ bgez $a1, .L800F8EF0 -/* B7007C 800F8EDC 468021A0 */ cvt.s.w $f6, $f4 -/* B70080 800F8EE0 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B70084 800F8EE4 44814000 */ mtc1 $at, $f8 -/* B70088 800F8EE8 00000000 */ nop -/* B7008C 800F8EEC 46083180 */ add.s $f6, $f6, $f8 -.L800F8EF0: -/* B70090 800F8EF0 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B70094 800F8EF4 44815000 */ mtc1 $at, $f10 -/* B70098 800F8EF8 C4500000 */ lwc1 $f16, ($v0) -/* B7009C 800F8EFC 44862000 */ mtc1 $a2, $f4 -/* B700A0 800F8F00 460A3003 */ div.s $f0, $f6, $f10 -/* B700A4 800F8F04 A446000C */ sh $a2, 0xc($v0) -/* B700A8 800F8F08 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B700AC 800F8F0C 46802220 */ cvt.s.w $f8, $f4 -/* B700B0 800F8F10 E4400004 */ swc1 $f0, 4($v0) -/* B700B4 800F8F14 04C10004 */ bgez $a2, .L800F8F28 -/* B700B8 800F8F18 46008481 */ sub.s $f18, $f16, $f0 -/* B700BC 800F8F1C 44813000 */ mtc1 $at, $f6 -/* B700C0 800F8F20 00000000 */ nop -/* B700C4 800F8F24 46064200 */ add.s $f8, $f8, $f6 -.L800F8F28: -/* B700C8 800F8F28 46089283 */ div.s $f10, $f18, $f8 -/* B700CC 800F8F2C 03E00008 */ jr $ra -/* B700D0 800F8F30 E44A0008 */ swc1 $f10, 8($v0) - diff --git a/asm/non_matchings/code/code_800F7260/func_800F8F34.s b/asm/non_matchings/code/code_800F7260/func_800F8F34.s deleted file mode 100644 index 8c4b54cb88..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8F34.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800F8F34 -/* B700D4 800F8F34 AFA40000 */ sw $a0, ($sp) -/* B700D8 800F8F38 308400FF */ andi $a0, $a0, 0xff -/* B700DC 800F8F3C 3C0F8017 */ lui $t7, %hi(D_8016E270) # $t7, 0x8017 -/* B700E0 800F8F40 25EFE270 */ addiu $t7, %lo(D_8016E270) # addiu $t7, $t7, -0x1d90 -/* B700E4 800F8F44 00047100 */ sll $t6, $a0, 4 -/* B700E8 800F8F48 01CF1021 */ addu $v0, $t6, $t7 -/* B700EC 800F8F4C 9443000C */ lhu $v1, 0xc($v0) -/* B700F0 800F8F50 1060000B */ beqz $v1, .L800F8F80 -/* B700F4 800F8F54 2478FFFF */ addiu $t8, $v1, -1 -/* B700F8 800F8F58 3319FFFF */ andi $t9, $t8, 0xffff -/* B700FC 800F8F5C 13200006 */ beqz $t9, .L800F8F78 -/* B70100 800F8F60 A458000C */ sh $t8, 0xc($v0) -/* B70104 800F8F64 C4440000 */ lwc1 $f4, ($v0) -/* B70108 800F8F68 C4460008 */ lwc1 $f6, 8($v0) -/* B7010C 800F8F6C 46062201 */ sub.s $f8, $f4, $f6 -/* B70110 800F8F70 03E00008 */ jr $ra -/* B70114 800F8F74 E4480000 */ swc1 $f8, ($v0) - -.L800F8F78: -/* B70118 800F8F78 C44A0004 */ lwc1 $f10, 4($v0) -/* B7011C 800F8F7C E44A0000 */ swc1 $f10, ($v0) -.L800F8F80: -/* B70120 800F8F80 03E00008 */ jr $ra -/* B70124 800F8F84 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F8F88.s b/asm/non_matchings/code/code_800F7260/func_800F8F88.s deleted file mode 100644 index 5fa6f113b7..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8F88.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800F8F88 -/* B70128 800F8F88 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3828) # $t7, 0x8017 -/* B7012C 800F8F8C 8DEF29A8 */ lw $t7, %lo(gAudioContext+0x3828)($t7) -/* B70130 800F8F90 3C0E8017 */ lui $t6, %hi(gAudioContext+0x5AB0) # $t6, 0x8017 -/* B70134 800F8F94 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B70138 800F8F98 25CE4C30 */ addiu $t6, %lo(gAudioContext+0x5AB0) # addiu $t6, $t6, 0x4c30 -/* B7013C 800F8F9C AFBF001C */ sw $ra, 0x1c($sp) -/* B70140 800F8FA0 11CF000F */ beq $t6, $t7, .L800F8FE0 -/* B70144 800F8FA4 AFB00018 */ sw $s0, 0x18($sp) -/* B70148 800F8FA8 3C018017 */ lui $at, %hi(D_8016E260) # $at, 0x8017 -/* B7014C 800F8FAC A020E260 */ sb $zero, %lo(D_8016E260)($at) -/* B70150 800F8FB0 00008025 */ move $s0, $zero -.L800F8FB4: -/* B70154 800F8FB4 0C03DF3B */ jal func_800F7CEC -/* B70158 800F8FB8 320400FF */ andi $a0, $s0, 0xff -/* B7015C 800F8FBC 0C03E120 */ jal func_800F8480 -/* B70160 800F8FC0 320400FF */ andi $a0, $s0, 0xff -/* B70164 800F8FC4 0C03E3CD */ jal func_800F8F34 -/* B70168 800F8FC8 320400FF */ andi $a0, $s0, 0xff -/* B7016C 800F8FCC 26100001 */ addiu $s0, $s0, 1 -/* B70170 800F8FD0 321000FF */ andi $s0, $s0, 0xff -/* B70174 800F8FD4 2A010007 */ slti $at, $s0, 7 -/* B70178 800F8FD8 1420FFF6 */ bnez $at, .L800F8FB4 -/* B7017C 800F8FDC 00000000 */ nop -.L800F8FE0: -/* B70180 800F8FE0 8FBF001C */ lw $ra, 0x1c($sp) -/* B70184 800F8FE4 8FB00018 */ lw $s0, 0x18($sp) -/* B70188 800F8FE8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B7018C 800F8FEC 03E00008 */ jr $ra -/* B70190 800F8FF0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F8FF4.s b/asm/non_matchings/code/code_800F7260/func_800F8FF4.s deleted file mode 100644 index 17ed1ace35..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F8FF4.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800F8FF4 -/* B70194 800F8FF4 308EF000 */ andi $t6, $a0, 0xf000 -/* B70198 800F8FF8 000E7B02 */ srl $t7, $t6, 0xc -/* B7019C 800F8FFC 31F800FF */ andi $t8, $t7, 0xff -/* B701A0 800F9000 0018C880 */ sll $t9, $t8, 2 -/* B701A4 800F9004 3C038013 */ lui $v1, %hi(D_801333A8) -/* B701A8 800F9008 00791821 */ addu $v1, $v1, $t9 -/* B701AC 800F900C 8C6333A8 */ lw $v1, %lo(D_801333A8)($v1) -/* B701B0 800F9010 240600FF */ li $a2, 255 -/* B701B4 800F9014 24070030 */ li $a3, 48 -/* B701B8 800F9018 9062002D */ lbu $v0, 0x2d($v1) -/* B701BC 800F901C 50C2000D */ beql $a2, $v0, .L800F9054 -/* B701C0 800F9020 00001025 */ move $v0, $zero -.L800F9024: -/* B701C4 800F9024 00470019 */ multu $v0, $a3 -/* B701C8 800F9028 00004012 */ mflo $t0 -/* B701CC 800F902C 00682821 */ addu $a1, $v1, $t0 -/* B701D0 800F9030 94A90028 */ lhu $t1, 0x28($a1) -/* B701D4 800F9034 54890004 */ bnel $a0, $t1, .L800F9048 -/* B701D8 800F9038 90A2002D */ lbu $v0, 0x2d($a1) -/* B701DC 800F903C 03E00008 */ jr $ra -/* B701E0 800F9040 24020001 */ li $v0, 1 - -/* B701E4 800F9044 90A2002D */ lbu $v0, 0x2d($a1) -.L800F9048: -/* B701E8 800F9048 14C2FFF6 */ bne $a2, $v0, .L800F9024 -/* B701EC 800F904C 00000000 */ nop -/* B701F0 800F9050 00001025 */ move $v0, $zero -.L800F9054: -/* B701F4 800F9054 03E00008 */ jr $ra -/* B701F8 800F9058 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F7260/func_800F905C.s b/asm/non_matchings/code/code_800F7260/func_800F905C.s deleted file mode 100644 index 07c7344758..0000000000 --- a/asm/non_matchings/code/code_800F7260/func_800F905C.s +++ /dev/null @@ -1,143 +0,0 @@ -glabel func_800F905C -/* B701FC 800F905C 3C018013 */ lui $at, %hi(D_801333A0) # $at, 0x8013 -/* B70200 800F9060 A02033A0 */ sb $zero, %lo(D_801333A0)($at) -/* B70204 800F9064 3C018013 */ lui $at, %hi(D_801333A4) # $at, 0x8013 -/* B70208 800F9068 A02033A4 */ sb $zero, %lo(D_801333A4)($at) -/* B7020C 800F906C 3C018013 */ lui $at, %hi(D_801333D0) # $at, 0x8013 -/* B70210 800F9070 A42033D0 */ sh $zero, %lo(D_801333D0)($at) -/* B70214 800F9074 3C013F80 */ lui $at, 0x3f80 -/* B70218 800F9078 3C098017 */ lui $t1, %hi(D_8016E270) # $t1, 0x8017 -/* B7021C 800F907C 3C088017 */ lui $t0, %hi(D_8016E264) # $t0, 0x8017 -/* B70220 800F9080 3C078017 */ lui $a3, %hi(D_8016E1B0) # $a3, 0x8017 -/* B70224 800F9084 3C058017 */ lui $a1, %hi(D_8016E1A8) # $a1, 0x8017 -/* B70228 800F9088 3C048017 */ lui $a0, %hi(D_8016E1A0) -/* B7022C 800F908C 44810000 */ mtc1 $at, $f0 -/* B70230 800F9090 2484E1A0 */ addiu $a0, %lo(D_8016E1A0) -/* B70234 800F9094 24A5E1A8 */ addiu $a1, %lo(D_8016E1A8) # addiu $a1, $a1, -0x1e58 -/* B70238 800F9098 24E7E1B0 */ addiu $a3, %lo(D_8016E1B0) # addiu $a3, $a3, -0x1e50 -/* B7023C 800F909C 2508E264 */ addiu $t0, %lo(D_8016E264) # addiu $t0, $t0, -0x1d9c -/* B70240 800F90A0 2529E270 */ addiu $t1, %lo(D_8016E270) # addiu $t1, $t1, -0x1d90 -/* B70244 800F90A4 00001025 */ move $v0, $zero -/* B70248 800F90A8 24060001 */ li $a2, 1 -.L800F90AC: -/* B7024C 800F90AC 00827021 */ addu $t6, $a0, $v0 -/* B70250 800F90B0 00A27821 */ addu $t7, $a1, $v0 -/* B70254 800F90B4 A1C00000 */ sb $zero, ($t6) -/* B70258 800F90B8 00E2C021 */ addu $t8, $a3, $v0 -/* B7025C 800F90BC 0102C821 */ addu $t9, $t0, $v0 -/* B70260 800F90C0 00026100 */ sll $t4, $v0, 4 -/* B70264 800F90C4 24420001 */ addiu $v0, $v0, 1 -/* B70268 800F90C8 A1E60000 */ sb $a2, ($t7) -/* B7026C 800F90CC 304200FF */ andi $v0, $v0, 0xff -/* B70270 800F90D0 A3000000 */ sb $zero, ($t8) -/* B70274 800F90D4 28410007 */ slti $at, $v0, 7 -/* B70278 800F90D8 A3200000 */ sb $zero, ($t9) -/* B7027C 800F90DC 012C1821 */ addu $v1, $t1, $t4 -/* B70280 800F90E0 E4600000 */ swc1 $f0, ($v1) -/* B70284 800F90E4 1420FFF1 */ bnez $at, .L800F90AC -/* B70288 800F90E8 A460000C */ sh $zero, 0xc($v1) -/* B7028C 800F90EC 00001025 */ move $v0, $zero -/* B70290 800F90F0 240800FF */ li $t0, 255 -/* B70294 800F90F4 00026880 */ sll $t5, $v0, 2 -.L800F90F8: -/* B70298 800F90F8 01A26823 */ subu $t5, $t5, $v0 -/* B7029C 800F90FC 3C0E8017 */ lui $t6, %hi(D_8016E1B8) # $t6, 0x8017 -/* B702A0 800F9100 25CEE1B8 */ addiu $t6, %lo(D_8016E1B8) # addiu $t6, $t6, -0x1e48 -/* B702A4 800F9104 000D68C0 */ sll $t5, $t5, 3 -/* B702A8 800F9108 01AE2021 */ addu $a0, $t5, $t6 -/* B702AC 800F910C 00001825 */ move $v1, $zero -.L800F9110: -/* B702B0 800F9110 000378C0 */ sll $t7, $v1, 3 -/* B702B4 800F9114 24630001 */ addiu $v1, $v1, 1 -/* B702B8 800F9118 306300FF */ andi $v1, $v1, 0xff -/* B702BC 800F911C 28610003 */ slti $at, $v1, 3 -/* B702C0 800F9120 008FC021 */ addu $t8, $a0, $t7 -/* B702C4 800F9124 1420FFFA */ bnez $at, .L800F9110 -/* B702C8 800F9128 A3080004 */ sb $t0, 4($t8) -/* B702CC 800F912C 24420001 */ addiu $v0, $v0, 1 -/* B702D0 800F9130 304200FF */ andi $v0, $v0, 0xff -/* B702D4 800F9134 28410007 */ slti $at, $v0, 7 -/* B702D8 800F9138 5420FFEF */ bnezl $at, .L800F90F8 -/* B702DC 800F913C 00026880 */ sll $t5, $v0, 2 -/* B702E0 800F9140 3C0A8013 */ lui $t2, %hi(D_801333C4) # $t2, 0x8013 -/* B702E4 800F9144 3C098013 */ lui $t1, %hi(D_801333A8) # $t1, 0x8013 -/* B702E8 800F9148 252933A8 */ addiu $t1, %lo(D_801333A8) # addiu $t1, $t1, 0x33a8 -/* B702EC 800F914C 254A33C4 */ addiu $t2, %lo(D_801333C4) # addiu $t2, $t2, 0x33c4 -/* B702F0 800F9150 00001025 */ move $v0, $zero -/* B702F4 800F9154 240B0030 */ li $t3, 48 -.L800F9158: -/* B702F8 800F9158 0002C880 */ sll $t9, $v0, 2 -/* B702FC 800F915C 01392821 */ addu $a1, $t1, $t9 -/* B70300 800F9160 8CAC0000 */ lw $t4, ($a1) -/* B70304 800F9164 01423021 */ addu $a2, $t2, $v0 -/* B70308 800F9168 24030001 */ li $v1, 1 -/* B7030C 800F916C A188002C */ sb $t0, 0x2c($t4) -/* B70310 800F9170 8CAD0000 */ lw $t5, ($a1) -/* B70314 800F9174 24040001 */ li $a0, 1 -/* B70318 800F9178 A1A8002D */ sb $t0, 0x2d($t5) -/* B7031C 800F917C 90CE0000 */ lbu $t6, ($a2) -/* B70320 800F9180 25CFFFFF */ addiu $t7, $t6, -1 -/* B70324 800F9184 29E10002 */ slti $at, $t7, 2 -/* B70328 800F9188 14200013 */ bnez $at, .L800F91D8 -/* B7032C 800F918C 00000000 */ nop -.L800F9190: -/* B70330 800F9190 006B0019 */ multu $v1, $t3 -/* B70334 800F9194 8CB90000 */ lw $t9, ($a1) -/* B70338 800F9198 2498FFFF */ addiu $t8, $a0, -1 -/* B7033C 800F919C 248D0001 */ addiu $t5, $a0, 1 -/* B70340 800F91A0 24630001 */ addiu $v1, $v1, 1 -/* B70344 800F91A4 306300FF */ andi $v1, $v1, 0xff -/* B70348 800F91A8 00602025 */ move $a0, $v1 -/* B7034C 800F91AC 00003812 */ mflo $a3 -/* B70350 800F91B0 03276021 */ addu $t4, $t9, $a3 -/* B70354 800F91B4 A198002C */ sb $t8, 0x2c($t4) -/* B70358 800F91B8 8CAE0000 */ lw $t6, ($a1) -/* B7035C 800F91BC 01C77821 */ addu $t7, $t6, $a3 -/* B70360 800F91C0 A1ED002D */ sb $t5, 0x2d($t7) -/* B70364 800F91C4 90D90000 */ lbu $t9, ($a2) -/* B70368 800F91C8 2738FFFF */ addiu $t8, $t9, -1 -/* B7036C 800F91CC 0078082A */ slt $at, $v1, $t8 -/* B70370 800F91D0 1420FFEF */ bnez $at, .L800F9190 -/* B70374 800F91D4 00000000 */ nop -.L800F91D8: -/* B70378 800F91D8 006B0019 */ multu $v1, $t3 -/* B7037C 800F91DC 8CAE0000 */ lw $t6, ($a1) -/* B70380 800F91E0 246CFFFF */ addiu $t4, $v1, -1 -/* B70384 800F91E4 24420001 */ addiu $v0, $v0, 1 -/* B70388 800F91E8 304200FF */ andi $v0, $v0, 0xff -/* B7038C 800F91EC 28410007 */ slti $at, $v0, 7 -/* B70390 800F91F0 00003812 */ mflo $a3 -/* B70394 800F91F4 01C76821 */ addu $t5, $t6, $a3 -/* B70398 800F91F8 A1AC002C */ sb $t4, 0x2c($t5) -/* B7039C 800F91FC 8CAF0000 */ lw $t7, ($a1) -/* B703A0 800F9200 01E7C821 */ addu $t9, $t7, $a3 -/* B703A4 800F9204 1420FFD4 */ bnez $at, .L800F9158 -/* B703A8 800F9208 A328002D */ sb $t0, 0x2d($t9) -/* B703AC 800F920C 3C058013 */ lui $a1, %hi(D_801333F8) # $a1, 0x8013 -/* B703B0 800F9210 24A533F8 */ addiu $a1, %lo(D_801333F8) # addiu $a1, $a1, 0x33f8 -/* B703B4 800F9214 90A30000 */ lbu $v1, ($a1) -/* B703B8 800F9218 3C088017 */ lui $t0, %hi(D_8016E310) # $t0, 0x8017 -/* B703BC 800F921C 2508E310 */ addiu $t0, %lo(D_8016E310) # addiu $t0, $t0, -0x1cf0 -/* B703C0 800F9220 14600012 */ bnez $v1, .L800F926C -/* B703C4 800F9224 00001025 */ move $v0, $zero -/* B703C8 800F9228 3C078017 */ lui $a3, %hi(D_8016E2F8) # $a3, 0x8017 -/* B703CC 800F922C 3C068017 */ lui $a2, %hi(D_8016E2E0) # $a2, 0x8017 -/* B703D0 800F9230 24C6E2E0 */ addiu $a2, %lo(D_8016E2E0) # addiu $a2, $a2, -0x1d20 -/* B703D4 800F9234 24E7E2F8 */ addiu $a3, %lo(D_8016E2F8) # addiu $a3, $a3, -0x1d08 -.L800F9238: -/* B703D8 800F9238 00022040 */ sll $a0, $v0, 1 -/* B703DC 800F923C 01026021 */ addu $t4, $t0, $v0 -/* B703E0 800F9240 24420001 */ addiu $v0, $v0, 1 -/* B703E4 800F9244 00C4C021 */ addu $t8, $a2, $a0 -/* B703E8 800F9248 304200FF */ andi $v0, $v0, 0xff -/* B703EC 800F924C A7000000 */ sh $zero, ($t8) -/* B703F0 800F9250 00E47021 */ addu $t6, $a3, $a0 -/* B703F4 800F9254 2841000A */ slti $at, $v0, 0xa -/* B703F8 800F9258 A5C00000 */ sh $zero, ($t6) -/* B703FC 800F925C 1420FFF6 */ bnez $at, .L800F9238 -/* B70400 800F9260 A1800000 */ sb $zero, ($t4) -/* B70404 800F9264 246D0001 */ addiu $t5, $v1, 1 -/* B70408 800F9268 A0AD0000 */ sb $t5, ($a1) -.L800F926C: -/* B7040C 800F926C 03E00008 */ jr $ra -/* B70410 800F9270 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/code_80104D60/osPfsFileState.s b/asm/non_matchings/code/code_80104D60/osPfsFileState.s deleted file mode 100644 index 3cef7ba40e..0000000000 --- a/asm/non_matchings/code/code_80104D60/osPfsFileState.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel osPfsFileState -/* B7BF00 80104D60 27BDFEA0 */ addiu $sp, $sp, -0x160 -/* B7BF04 80104D64 AFBF002C */ sw $ra, 0x2c($sp) -/* B7BF08 80104D68 AFB40028 */ sw $s4, 0x28($sp) -/* B7BF0C 80104D6C AFB30024 */ sw $s3, 0x24($sp) -/* B7BF10 80104D70 AFB20020 */ sw $s2, 0x20($sp) -/* B7BF14 80104D74 AFB1001C */ sw $s1, 0x1c($sp) -/* B7BF18 80104D78 AFB00018 */ sw $s0, 0x18($sp) -/* B7BF1C 80104D7C AFA60168 */ sw $a2, 0x168($sp) -/* B7BF20 80104D80 8C8E0050 */ lw $t6, 0x50($a0) -/* B7BF24 80104D84 00A08025 */ move $s0, $a1 -/* B7BF28 80104D88 00809825 */ move $s3, $a0 -/* B7BF2C 80104D8C 00AE082A */ slt $at, $a1, $t6 -/* B7BF30 80104D90 10200003 */ beqz $at, .L80104DA0 -/* B7BF34 80104D94 00000000 */ nop -/* B7BF38 80104D98 04A30004 */ bgezl $a1, .L80104DAC -/* B7BF3C 80104D9C 8E6F0000 */ lw $t7, ($s3) -.L80104DA0: -/* B7BF40 80104DA0 1000005E */ b .L80104F1C -/* B7BF44 80104DA4 24020005 */ li $v0, 5 -/* B7BF48 80104DA8 8E6F0000 */ lw $t7, ($s3) -.L80104DAC: -/* B7BF4C 80104DAC 31F80001 */ andi $t8, $t7, 1 -/* B7BF50 80104DB0 17000003 */ bnez $t8, .L80104DC0 -/* B7BF54 80104DB4 00000000 */ nop -/* B7BF58 80104DB8 10000058 */ b .L80104F1C -/* B7BF5C 80104DBC 24020005 */ li $v0, 5 -.L80104DC0: -/* B7BF60 80104DC0 0C040AFC */ jal __osCheckId -/* B7BF64 80104DC4 02602025 */ move $a0, $s3 -/* B7BF68 80104DC8 50400004 */ beql $v0, $zero, .L80104DDC -/* B7BF6C 80104DCC 92790065 */ lbu $t9, 0x65($s3) -/* B7BF70 80104DD0 10000053 */ b .L80104F20 -/* B7BF74 80104DD4 8FBF002C */ lw $ra, 0x2c($sp) -/* B7BF78 80104DD8 92790065 */ lbu $t9, 0x65($s3) -.L80104DDC: -/* B7BF7C 80104DDC 02602025 */ move $a0, $s3 -/* B7BF80 80104DE0 53200008 */ beql $t9, $zero, .L80104E04 -/* B7BF84 80104DE4 8E68005C */ lw $t0, 0x5c($s3) -/* B7BF88 80104DE8 0C041320 */ jal __osPfsSelectBank -/* B7BF8C 80104DEC 00002825 */ move $a1, $zero -/* B7BF90 80104DF0 50400004 */ beql $v0, $zero, .L80104E04 -/* B7BF94 80104DF4 8E68005C */ lw $t0, 0x5c($s3) -/* B7BF98 80104DF8 10000049 */ b .L80104F20 -/* B7BF9C 80104DFC 8FBF002C */ lw $ra, 0x2c($sp) -/* B7BFA0 80104E00 8E68005C */ lw $t0, 0x5c($s3) -.L80104E04: -/* B7BFA4 80104E04 8E640004 */ lw $a0, 4($s3) -/* B7BFA8 80104E08 8E650008 */ lw $a1, 8($s3) -/* B7BFAC 80104E0C 01103021 */ addu $a2, $t0, $s0 -/* B7BFB0 80104E10 30C9FFFF */ andi $t1, $a2, 0xffff -/* B7BFB4 80104E14 01203025 */ move $a2, $t1 -/* B7BFB8 80104E18 0C0417D0 */ jal __osContRamRead -/* B7BFBC 80104E1C 27A70038 */ addiu $a3, $sp, 0x38 -/* B7BFC0 80104E20 10400003 */ beqz $v0, .L80104E30 -/* B7BFC4 80104E24 97AA003C */ lhu $t2, 0x3c($sp) -/* B7BFC8 80104E28 1000003D */ b .L80104F20 -/* B7BFCC 80104E2C 8FBF002C */ lw $ra, 0x2c($sp) -.L80104E30: -/* B7BFD0 80104E30 11400003 */ beqz $t2, .L80104E40 -/* B7BFD4 80104E34 8FAB0038 */ lw $t3, 0x38($sp) -/* B7BFD8 80104E38 15600003 */ bnez $t3, .L80104E48 -/* B7BFDC 80104E3C 27B40034 */ addiu $s4, $sp, 0x34 -.L80104E40: -/* B7BFE0 80104E40 10000036 */ b .L80104F1C -/* B7BFE4 80104E44 24020005 */ li $v0, 5 -.L80104E48: -/* B7BFE8 80104E48 27AC003E */ addiu $t4, $sp, 0x3e -/* B7BFEC 80104E4C 95810000 */ lhu $at, ($t4) -/* B7BFF0 80104E50 00009025 */ move $s2, $zero -/* B7BFF4 80104E54 241000FF */ li $s0, 255 -/* B7BFF8 80104E58 27B10058 */ addiu $s1, $sp, 0x58 -/* B7BFFC 80104E5C A6810000 */ sh $at, ($s4) -.L80104E60: -/* B7C000 80104E60 97AF0034 */ lhu $t7, 0x34($sp) -/* B7C004 80104E64 8E780060 */ lw $t8, 0x60($s3) -/* B7C008 80104E68 93B90034 */ lbu $t9, 0x34($sp) -/* B7C00C 80104E6C 02602025 */ move $a0, $s3 -/* B7C010 80104E70 01F8082A */ slt $at, $t7, $t8 -/* B7C014 80104E74 14200011 */ bnez $at, .L80104EBC -/* B7C018 80104E78 02202825 */ move $a1, $s1 -/* B7C01C 80104E7C 12190008 */ beq $s0, $t9, .L80104EA0 -/* B7C020 80104E80 00003025 */ move $a2, $zero -/* B7C024 80104E84 03208025 */ move $s0, $t9 -/* B7C028 80104E88 0C040B31 */ jal __osPfsRWInode -/* B7C02C 80104E8C 332700FF */ andi $a3, $t9, 0xff -/* B7C030 80104E90 50400004 */ beql $v0, $zero, .L80104EA4 -/* B7C034 80104E94 93A80035 */ lbu $t0, 0x35($sp) -/* B7C038 80104E98 10000021 */ b .L80104F20 -/* B7C03C 80104E9C 8FBF002C */ lw $ra, 0x2c($sp) -.L80104EA0: -/* B7C040 80104EA0 93A80035 */ lbu $t0, 0x35($sp) -.L80104EA4: -/* B7C044 80104EA4 26520001 */ addiu $s2, $s2, 1 -/* B7C048 80104EA8 00084840 */ sll $t1, $t0, 1 -/* B7C04C 80104EAC 02295021 */ addu $t2, $s1, $t1 -/* B7C050 80104EB0 95410000 */ lhu $at, ($t2) -/* B7C054 80104EB4 1000FFEA */ b .L80104E60 -/* B7C058 80104EB8 A6810000 */ sh $at, ($s4) -.L80104EBC: -/* B7C05C 80104EBC 97AC0034 */ lhu $t4, 0x34($sp) -/* B7C060 80104EC0 24010001 */ li $at, 1 -/* B7C064 80104EC4 8FA20168 */ lw $v0, 0x168($sp) -/* B7C068 80104EC8 11810003 */ beq $t4, $at, .L80104ED8 -/* B7C06C 80104ECC 00127200 */ sll $t6, $s2, 8 -/* B7C070 80104ED0 10000012 */ b .L80104F1C -/* B7C074 80104ED4 24020003 */ li $v0, 3 -.L80104ED8: -/* B7C078 80104ED8 AC4E0000 */ sw $t6, ($v0) -/* B7C07C 80104EDC 97AF003C */ lhu $t7, 0x3c($sp) -/* B7C080 80104EE0 27A40048 */ addiu $a0, $sp, 0x48 -/* B7C084 80104EE4 2445000E */ addiu $a1, $v0, 0xe -/* B7C088 80104EE8 A44F0008 */ sh $t7, 8($v0) -/* B7C08C 80104EEC 8FB80038 */ lw $t8, 0x38($sp) -/* B7C090 80104EF0 24060010 */ li $a2, 16 -/* B7C094 80104EF4 0C001BC4 */ jal bcopy -/* B7C098 80104EF8 AC580004 */ sw $t8, 4($v0) -/* B7C09C 80104EFC 8FA50168 */ lw $a1, 0x168($sp) -/* B7C0A0 80104F00 27A40044 */ addiu $a0, $sp, 0x44 -/* B7C0A4 80104F04 24060004 */ li $a2, 4 -/* B7C0A8 80104F08 0C001BC4 */ jal bcopy -/* B7C0AC 80104F0C 24A5000A */ addiu $a1, $a1, 0xa -/* B7C0B0 80104F10 8E640004 */ lw $a0, 4($s3) -/* B7C0B4 80104F14 0C040644 */ jal __osPfsGetStatus -/* B7C0B8 80104F18 8E650008 */ lw $a1, 8($s3) -.L80104F1C: -/* B7C0BC 80104F1C 8FBF002C */ lw $ra, 0x2c($sp) -.L80104F20: -/* B7C0C0 80104F20 8FB00018 */ lw $s0, 0x18($sp) -/* B7C0C4 80104F24 8FB1001C */ lw $s1, 0x1c($sp) -/* B7C0C8 80104F28 8FB20020 */ lw $s2, 0x20($sp) -/* B7C0CC 80104F2C 8FB30024 */ lw $s3, 0x24($sp) -/* B7C0D0 80104F30 8FB40028 */ lw $s4, 0x28($sp) -/* B7C0D4 80104F34 03E00008 */ jr $ra -/* B7C0D8 80104F38 27BD0160 */ addiu $sp, $sp, 0x160 \ No newline at end of file diff --git a/asm/non_matchings/code/z_parameter/Item_Give.s b/asm/non_matchings/code/z_parameter/Item_Give.s index 5a7392b2a3..f623b249de 100644 --- a/asm/non_matchings/code/z_parameter/Item_Give.s +++ b/asm/non_matchings/code/z_parameter/Item_Give.s @@ -1403,7 +1403,7 @@ glabel Item_Give /* AFD168 80085FC8 2401000A */ li $at, 10 /* AFD16C 80085FCC 51810004 */ beql $t4, $at, .L80085FE0 /* AFD170 80085FD0 8FA40048 */ lw $a0, 0x48($sp) -/* AFD174 80085FD4 0C021DA0 */ jal func_80087680 +/* AFD174 80085FD4 0C021DA0 */ jal Magic_Fill /* AFD178 80085FD8 8FA40048 */ lw $a0, 0x48($sp) /* AFD17C 80085FDC 8FA40048 */ lw $a0, 0x48($sp) .L80085FE0: @@ -1428,7 +1428,7 @@ glabel Item_Give /* AFD1C0 80086020 2401000A */ li $at, 10 /* AFD1C4 80086024 51C10004 */ beql $t6, $at, .L80086038 /* AFD1C8 80086028 8FA40048 */ lw $a0, 0x48($sp) -/* AFD1CC 8008602C 0C021DA0 */ jal func_80087680 +/* AFD1CC 8008602C 0C021DA0 */ jal Magic_Fill /* AFD1D0 80086030 8FA40048 */ lw $a0, 0x48($sp) /* AFD1D4 80086034 8FA40048 */ lw $a0, 0x48($sp) .L80086038: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s index 21cee26d05..2d11a59a90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s @@ -150,7 +150,7 @@ glabel func_80873868 /* 01238 80873A68 14410008 */ bne $v0, $at, .L80873A8C /* 0123C 80873A6C 00000000 */ nop /* 01240 80873A70 A4781424 */ sh $t8, 0x1424($v1) ## 8015FA84 -/* 01244 80873A74 0C021DA0 */ jal func_80087680 +/* 01244 80873A74 0C021DA0 */ jal Magic_Fill /* 01248 80873A78 8FA40064 */ lw $a0, 0x0064($sp) /* 0124C 80873A7C 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 /* 01250 80873A80 A6190306 */ sh $t9, 0x0306($s0) ## 00000306 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s index 90055c0a83..01a1f4a8b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s @@ -234,7 +234,7 @@ glabel func_80874304 /* 01E10 80874640 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 01E14 80874644 14610003 */ bne $v1, $at, .L80874654 /* 01E18 80874648 A20E02E6 */ sb $t6, 0x02E6($s0) ## 000002E6 -/* 01E1C 8087464C 0C021DA0 */ jal func_80087680 +/* 01E1C 8087464C 0C021DA0 */ jal Magic_Fill /* 01E20 80874650 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80874654: /* 01E24 80874654 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 @@ -303,7 +303,7 @@ glabel func_80874304 /* 01F10 80874740 10000006 */ beq $zero, $zero, .L8087475C /* 01F14 80874744 A04C003A */ sb $t4, 0x003A($v0) ## 8015E69A .L80874748: -/* 01F18 80874748 0C021DA0 */ jal func_80087680 +/* 01F18 80874748 0C021DA0 */ jal Magic_Fill /* 01F1C 8087474C A7A30056 */ sh $v1, 0x0056($sp) /* 01F20 80874750 3C028016 */ lui $v0, %hi(gSaveContext) /* 01F24 80874754 2442E660 */ addiu $v0, %lo(gSaveContext) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s deleted file mode 100644 index 9d0b0ba26d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel BgHidanFwbig_Destroy -/* 00198 80887488 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0019C 8088748C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001A0 80887490 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 80887494 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001A8 80887498 0C0170EB */ jal Collider_DestroyCylinder - -/* 001AC 8088749C 24C50154 */ addiu $a1, $a2, 0x0154 ## $a1 = 00000154 -/* 001B0 808874A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001B4 808874A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001B8 808874A8 03E00008 */ jr $ra -/* 001BC 808874AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s deleted file mode 100644 index c82887d2ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s +++ /dev/null @@ -1,202 +0,0 @@ -.rdata -glabel D_80887F00 - .asciz "../z_bg_hidan_fwbig.c" - .balign 4 - -glabel D_80887F18 - .asciz "../z_bg_hidan_fwbig.c" - .balign 4 - -glabel D_80887F30 - .asciz "../z_bg_hidan_fwbig.c" - .balign 4 - -.text -glabel BgHidanFwbig_Draw -/* 008E0 80887BD0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 008E4 80887BD4 AFB10038 */ sw $s1, 0x0038($sp) -/* 008E8 80887BD8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 008EC 80887BDC AFBF003C */ sw $ra, 0x003C($sp) -/* 008F0 80887BE0 AFB00034 */ sw $s0, 0x0034($sp) -/* 008F4 80887BE4 AFA40080 */ sw $a0, 0x0080($sp) -/* 008F8 80887BE8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 008FC 80887BEC 3C068088 */ lui $a2, %hi(D_80887F00) ## $a2 = 80880000 -/* 00900 80887BF0 24C67F00 */ addiu $a2, $a2, %lo(D_80887F00) ## $a2 = 80887F00 -/* 00904 80887BF4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 00908 80887BF8 24070276 */ addiu $a3, $zero, 0x0276 ## $a3 = 00000276 -/* 0090C 80887BFC 0C031AB1 */ jal Graph_OpenDisps -/* 00910 80887C00 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00914 80887C04 0C024F61 */ jal func_80093D84 -/* 00918 80887C08 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0091C 80887C0C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00920 80887C10 3C040401 */ lui $a0, 0x0401 ## $a0 = 04010000 -/* 00924 80887C14 248473D0 */ addiu $a0, $a0, 0x73D0 ## $a0 = 040173D0 -/* 00928 80887C18 0004C100 */ sll $t8, $a0, 4 -/* 0092C 80887C1C 0018CF02 */ srl $t9, $t8, 28 -/* 00930 80887C20 3C058016 */ lui $a1, %hi(gSegments) -/* 00934 80887C24 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00938 80887C28 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0093C 80887C2C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00940 80887C30 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 00944 80887C34 24A56FA8 */ addiu $a1, %lo(gSegments) -/* 00948 80887C38 00194880 */ sll $t1, $t9, 2 -/* 0094C 80887C3C 00A95021 */ addu $t2, $a1, $t1 -/* 00950 80887C40 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00954 80887C44 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 00958 80887C48 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 0095C 80887C4C 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 00960 80887C50 00866024 */ and $t4, $a0, $a2 -/* 00964 80887C54 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00968 80887C58 016C6821 */ addu $t5, $t3, $t4 -/* 0096C 80887C5C 01A77021 */ addu $t6, $t5, $a3 -/* 00970 80887C60 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00974 80887C64 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00978 80887C68 3C040401 */ lui $a0, 0x0401 ## $a0 = 04010000 -/* 0097C 80887C6C 24847BD0 */ addiu $a0, $a0, 0x7BD0 ## $a0 = 04017BD0 -/* 00980 80887C70 0004C900 */ sll $t9, $a0, 4 -/* 00984 80887C74 00194F02 */ srl $t1, $t9, 28 -/* 00988 80887C78 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 0098C 80887C7C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00990 80887C80 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00994 80887C84 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 00998 80887C88 00095080 */ sll $t2, $t1, 2 -/* 0099C 80887C8C 00AA5821 */ addu $t3, $a1, $t2 -/* 009A0 80887C90 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 009A4 80887C94 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 009A8 80887C98 00866824 */ and $t5, $a0, $a2 -/* 009AC 80887C9C 3C014516 */ lui $at, 0x4516 ## $at = 45160000 -/* 009B0 80887CA0 018D7021 */ addu $t6, $t4, $t5 -/* 009B4 80887CA4 01C77821 */ addu $t7, $t6, $a3 -/* 009B8 80887CA8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 009BC 80887CAC 8FA40080 */ lw $a0, 0x0080($sp) -/* 009C0 80887CB0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 009C4 80887CB4 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 009C8 80887CB8 C4840054 */ lwc1 $f4, 0x0054($a0) ## 04017C24 -/* 009CC 80887CBC 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 009D0 80887CC0 44813000 */ mtc1 $at, $f6 ## $f6 = 2400.00 -/* 009D4 80887CC4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 009D8 80887CC8 37398080 */ ori $t9, $t9, 0x8080 ## $t9 = FA008080 -/* 009DC 80887CCC AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 009E0 80887CD0 46062002 */ mul.s $f0, $f4, $f6 -/* 009E4 80887CD4 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 04017BF8 -/* 009E8 80887CD8 C488000C */ lwc1 $f8, 0x000C($a0) ## 04017BDC -/* 009EC 80887CDC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 009F0 80887CE0 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 009F4 80887CE4 460A4401 */ sub.s $f16, $f8, $f10 -/* 009F8 80887CE8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 009FC 80887CEC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00A00 80887CF0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00A04 80887CF4 46100481 */ sub.s $f18, $f0, $f16 -/* 00A08 80887CF8 3C0FFF00 */ lui $t7, 0xFF00 ## $t7 = FF000000 -/* 00A0C 80887CFC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 00A10 80887D00 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 00A14 80887D04 46049182 */ mul.s $f6, $f18, $f4 -/* 00A18 80887D08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A1C 80887D0C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A20 80887D10 46003203 */ div.s $f8, $f6, $f0 -/* 00A24 80887D14 4449F800 */ cfc1 $t1, $31 -/* 00A28 80887D18 44CAF800 */ ctc1 $t2, $31 -/* 00A2C 80887D1C 00000000 */ nop -/* 00A30 80887D20 460042A4 */ cvt.w.s $f10, $f8 -/* 00A34 80887D24 444AF800 */ cfc1 $t2, $31 -/* 00A38 80887D28 00000000 */ nop -/* 00A3C 80887D2C 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 00A40 80887D30 51400013 */ beql $t2, $zero, .L80887D80 -/* 00A44 80887D34 440A5000 */ mfc1 $t2, $f10 -/* 00A48 80887D38 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 00A4C 80887D3C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00A50 80887D40 460A4281 */ sub.s $f10, $f8, $f10 -/* 00A54 80887D44 44CAF800 */ ctc1 $t2, $31 -/* 00A58 80887D48 00000000 */ nop -/* 00A5C 80887D4C 460052A4 */ cvt.w.s $f10, $f10 -/* 00A60 80887D50 444AF800 */ cfc1 $t2, $31 -/* 00A64 80887D54 00000000 */ nop -/* 00A68 80887D58 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 00A6C 80887D5C 15400005 */ bne $t2, $zero, .L80887D74 -/* 00A70 80887D60 00000000 */ nop -/* 00A74 80887D64 440A5000 */ mfc1 $t2, $f10 -/* 00A78 80887D68 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00A7C 80887D6C 10000007 */ beq $zero, $zero, .L80887D8C -/* 00A80 80887D70 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80887D74: -/* 00A84 80887D74 10000005 */ beq $zero, $zero, .L80887D8C -/* 00A88 80887D78 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00A8C 80887D7C 440A5000 */ mfc1 $t2, $f10 -.L80887D80: -/* 00A90 80887D80 00000000 */ nop -/* 00A94 80887D84 0540FFFB */ bltz $t2, .L80887D74 -/* 00A98 80887D88 00000000 */ nop -.L80887D8C: -/* 00A9C 80887D8C 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 000000FF -/* 00AA0 80887D90 3C01FFDC */ lui $at, 0xFFDC ## $at = FFDC0000 -/* 00AA4 80887D94 01616025 */ or $t4, $t3, $at ## $t4 = FFDC00FF -/* 00AA8 80887D98 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 00AAC 80887D9C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00AB0 80887DA0 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 00AB4 80887DA4 00711821 */ addu $v1, $v1, $s1 -/* 00AB8 80887DA8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00ABC 80887DAC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00AC0 80887DB0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00AC4 80887DB4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00AC8 80887DB8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00ACC 80887DBC 44C9F800 */ ctc1 $t1, $31 -/* 00AD0 80887DC0 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 00AD4 80887DC4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00AD8 80887DC8 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00ADC 80887DCC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00AE0 80887DD0 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 00AE4 80887DD4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00AE8 80887DD8 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 -/* 00AEC 80887DDC 00030823 */ subu $at, $zero, $v1 -/* 00AF0 80887DE0 00016100 */ sll $t4, $at, 4 -/* 00AF4 80887DE4 01816023 */ subu $t4, $t4, $at -/* 00AF8 80887DE8 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 000000FF -/* 00AFC 80887DEC 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 00B00 80887DF0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00B04 80887DF4 240A0040 */ addiu $t2, $zero, 0x0040 ## $t2 = 00000040 -/* 00B08 80887DF8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00B0C 80887DFC AFAB0018 */ sw $t3, 0x0018($sp) -/* 00B10 80887E00 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00B14 80887E04 AFAD0020 */ sw $t5, 0x0020($sp) -/* 00B18 80887E08 AFAF0028 */ sw $t7, 0x0028($sp) -/* 00B1C 80887E0C AFA0001C */ sw $zero, 0x001C($sp) -/* 00B20 80887E10 AFA90010 */ sw $t1, 0x0010($sp) -/* 00B24 80887E14 AFA20050 */ sw $v0, 0x0050($sp) -/* 00B28 80887E18 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00B2C 80887E1C 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 -/* 00B30 80887E20 8FA80050 */ lw $t0, 0x0050($sp) -/* 00B34 80887E24 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00B38 80887E28 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 00B3C 80887E2C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 00B40 80887E30 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B44 80887E34 3C058088 */ lui $a1, %hi(D_80887F18) ## $a1 = 80880000 -/* 00B48 80887E38 24A57F18 */ addiu $a1, $a1, %lo(D_80887F18) ## $a1 = 80887F18 -/* 00B4C 80887E3C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00B50 80887E40 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00B54 80887E44 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00B58 80887E48 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00B5C 80887E4C 24060294 */ addiu $a2, $zero, 0x0294 ## $a2 = 00000294 -/* 00B60 80887E50 0C0346A2 */ jal Matrix_NewMtx -/* 00B64 80887E54 AFA2004C */ sw $v0, 0x004C($sp) -/* 00B68 80887E58 8FA3004C */ lw $v1, 0x004C($sp) -/* 00B6C 80887E5C 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 00B70 80887E60 256BDB20 */ addiu $t3, $t3, 0xDB20 ## $t3 = 0600DB20 -/* 00B74 80887E64 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00B78 80887E68 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B7C 80887E6C 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00B80 80887E70 3C068088 */ lui $a2, %hi(D_80887F30) ## $a2 = 80880000 -/* 00B84 80887E74 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00B88 80887E78 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00B8C 80887E7C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00B90 80887E80 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00B94 80887E84 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00B98 80887E88 24C67F30 */ addiu $a2, $a2, %lo(D_80887F30) ## $a2 = 80887F30 -/* 00B9C 80887E8C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 00BA0 80887E90 0C031AD5 */ jal Graph_CloseDisps -/* 00BA4 80887E94 24070298 */ addiu $a3, $zero, 0x0298 ## $a3 = 00000298 -/* 00BA8 80887E98 8FBF003C */ lw $ra, 0x003C($sp) -/* 00BAC 80887E9C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00BB0 80887EA0 8FB10038 */ lw $s1, 0x0038($sp) -/* 00BB4 80887EA4 03E00008 */ jr $ra -/* 00BB8 80887EA8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 00BBC 80887EAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s deleted file mode 100644 index 413f24e89e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel BgHidanFwbig_Init -/* 00000 808872F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 808872F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00008 808872F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0000C 808872FC AFA50034 */ sw $a1, 0x0034($sp) -/* 00010 80887300 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00014 80887304 3C058088 */ lui $a1, %hi(D_80887EFC) ## $a1 = 80880000 -/* 00018 80887308 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 8088730C 24A57EFC */ addiu $a1, $a1, %lo(D_80887EFC) ## $a1 = 80887EFC -/* 00020 80887310 0C01E037 */ jal Actor_ProcessInitChain - -/* 00024 80887314 AFAF0024 */ sw $t7, 0x0024($sp) -/* 00028 80887318 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 -/* 0002C 8088731C AFA50020 */ sw $a1, 0x0020($sp) -/* 00030 80887320 0C0170D9 */ jal Collider_InitCylinder - -/* 00034 80887324 8FA40034 */ lw $a0, 0x0034($sp) -/* 00038 80887328 3C078088 */ lui $a3, %hi(D_80887ED0) ## $a3 = 80880000 -/* 0003C 8088732C 8FA50020 */ lw $a1, 0x0020($sp) -/* 00040 80887330 24E77ED0 */ addiu $a3, $a3, %lo(D_80887ED0) ## $a3 = 80887ED0 -/* 00044 80887334 8FA40034 */ lw $a0, 0x0034($sp) -/* 00048 80887338 0C01712B */ jal Collider_SetCylinder - -/* 0004C 8088733C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00050 80887340 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00054 80887344 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 00058 80887348 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 0005C 8088734C 00194A03 */ sra $t1, $t9, 8 -/* 00060 80887350 A2090150 */ sb $t1, 0x0150($s0) ## 00000150 -/* 00064 80887354 820C0150 */ lb $t4, 0x0150($s0) ## 00000150 -/* 00068 80887358 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 0006C 8088735C A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE -/* 00070 80887360 1180003D */ beq $t4, $zero, .L80887458 -/* 00074 80887364 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C -/* 00078 80887368 3C0144C3 */ lui $at, 0x44C3 ## $at = 44C30000 -/* 0007C 8088736C 44812000 */ mtc1 $at, $f4 ## $f4 = 1560.00 -/* 00080 80887370 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00084 80887374 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00088 80887378 E6040008 */ swc1 $f4, 0x0008($s0) ## 00000008 -/* 0008C 8088737C E6060010 */ swc1 $f6, 0x0010($s0) ## 00000010 -/* 00090 80887380 8FAD0024 */ lw $t5, 0x0024($sp) -/* 00094 80887384 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 -/* 00098 80887388 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 0009C 8088738C C5A0002C */ lwc1 $f0, 0x002C($t5) ## 0000002C -/* 000A0 80887390 240FB1C8 */ addiu $t7, $zero, 0xB1C8 ## $t7 = FFFFB1C8 -/* 000A4 80887394 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 -/* 000A8 80887398 4600403C */ c.lt.s $f8, $f0 -/* 000AC 8088739C 00000000 */ nop -/* 000B0 808873A0 45020007 */ bc1fl .L808873C0 -/* 000B4 808873A4 44815000 */ mtc1 $at, $f10 ## $f10 = -300.00 -/* 000B8 808873A8 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 000BC 808873AC 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 000C0 808873B0 A20E0150 */ sb $t6, 0x0150($s0) ## 00000150 -/* 000C4 808873B4 10000011 */ beq $zero, $zero, .L808873FC -/* 000C8 808873B8 A6180016 */ sh $t8, 0x0016($s0) ## 00000016 -/* 000CC 808873BC 44815000 */ mtc1 $at, $f10 ## $f10 = -300.00 -.L808873C0: -/* 000D0 808873C0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 000D4 808873C4 2408CE38 */ addiu $t0, $zero, 0xCE38 ## $t0 = FFFFCE38 -/* 000D8 808873C8 460A003C */ c.lt.s $f0, $f10 -/* 000DC 808873CC 00000000 */ nop -/* 000E0 808873D0 45000006 */ bc1f .L808873EC -/* 000E4 808873D4 00000000 */ nop -/* 000E8 808873D8 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 000EC 808873DC 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 000F0 808873E0 A2190150 */ sb $t9, 0x0150($s0) ## 00000150 -/* 000F4 808873E4 10000005 */ beq $zero, $zero, .L808873FC -/* 000F8 808873E8 A6090016 */ sh $t1, 0x0016($s0) ## 00000016 -.L808873EC: -/* 000FC 808873EC 0C00B55C */ jal Actor_Kill - -/* 00100 808873F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00104 808873F4 10000020 */ beq $zero, $zero, .L80887478 -/* 00108 808873F8 8FBF001C */ lw $ra, 0x001C($sp) -.L808873FC: -/* 0010C 808873FC 0C221D2C */ jal func_808874B0 -/* 00110 80887400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00114 80887404 3C053E19 */ lui $a1, 0x3E19 ## $a1 = 3E190000 -/* 00118 80887408 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E19999A -/* 0011C 8088740C 0C00B58B */ jal Actor_SetScale - -/* 00120 80887410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00124 80887414 3C014516 */ lui $at, 0x4516 ## $at = 45160000 -/* 00128 80887418 44818000 */ mtc1 $at, $f16 ## $f16 = 2400.00 -/* 0012C 8088741C C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 -/* 00130 80887420 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 00134 80887424 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 00138 80887428 46128102 */ mul.s $f4, $f16, $f18 -/* 0013C 8088742C 3C0D8088 */ lui $t5, %hi(func_80887768) ## $t5 = 80880000 -/* 00140 80887430 240A00E6 */ addiu $t2, $zero, 0x00E6 ## $t2 = 000000E6 -/* 00144 80887434 25AD7768 */ addiu $t5, $t5, %lo(func_80887768) ## $t5 = 80887768 -/* 00148 80887438 356C0010 */ ori $t4, $t3, 0x0010 ## $t4 = 00000010 -/* 0014C 8088743C A60A0196 */ sh $t2, 0x0196($s0) ## 00000196 -/* 00150 80887440 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00154 80887444 46043201 */ sub.s $f8, $f6, $f4 -/* 00158 80887448 A2000151 */ sb $zero, 0x0151($s0) ## 00000151 -/* 0015C 8088744C AE0D014C */ sw $t5, 0x014C($s0) ## 0000014C -/* 00160 80887450 10000008 */ beq $zero, $zero, .L80887474 -/* 00164 80887454 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -.L80887458: -/* 00168 80887458 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 0016C 8088745C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00170 80887460 0C00B58B */ jal Actor_SetScale - -/* 00174 80887464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00178 80887468 3C0E8088 */ lui $t6, %hi(func_80887534) ## $t6 = 80880000 -/* 0017C 8088746C 25CE7534 */ addiu $t6, $t6, %lo(func_80887534) ## $t6 = 80887534 -/* 00180 80887470 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -.L80887474: -/* 00184 80887474 8FBF001C */ lw $ra, 0x001C($sp) -.L80887478: -/* 00188 80887478 8FB00018 */ lw $s0, 0x0018($sp) -/* 0018C 8088747C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00190 80887480 03E00008 */ jr $ra -/* 00194 80887484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s deleted file mode 100644 index 6ff8bed745..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel BgHidanFwbig_Update -/* 00768 80887A58 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0076C 80887A5C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00770 80887A60 AFB10020 */ sw $s1, 0x0020($sp) -/* 00774 80887A64 AFB0001C */ sw $s0, 0x001C($sp) -/* 00778 80887A68 90820164 */ lbu $v0, 0x0164($a0) ## 00000164 -/* 0077C 80887A6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00780 80887A70 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00784 80887A74 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 00788 80887A78 11C00010 */ beq $t6, $zero, .L80887ABC -/* 0078C 80887A7C 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 00790 80887A80 A08F0164 */ sb $t7, 0x0164($a0) ## 00000164 -/* 00794 80887A84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00798 80887A88 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0079C 80887A8C 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 007A0 80887A90 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 007A4 80887A94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 007A8 80887A98 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 007AC 80887A9C 0C00BDC7 */ jal func_8002F71C -/* 007B0 80887AA0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 007B4 80887AA4 82180150 */ lb $t8, 0x0150($s0) ## 00000150 -/* 007B8 80887AA8 3C198088 */ lui $t9, %hi(func_80887638) ## $t9 = 80880000 -/* 007BC 80887AAC 27397638 */ addiu $t9, $t9, %lo(func_80887638) ## $t9 = 80887638 -/* 007C0 80887AB0 53000003 */ beql $t8, $zero, .L80887AC0 -/* 007C4 80887AB4 82080150 */ lb $t0, 0x0150($s0) ## 00000150 -/* 007C8 80887AB8 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -.L80887ABC: -/* 007CC 80887ABC 82080150 */ lb $t0, 0x0150($s0) ## 00000150 -.L80887AC0: -/* 007D0 80887AC0 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 007D4 80887AC4 01515021 */ addu $t2, $t2, $s1 -/* 007D8 80887AC8 5100000A */ beql $t0, $zero, .L80887AF4 -/* 007DC 80887ACC 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 007E0 80887AD0 82090003 */ lb $t1, 0x0003($s0) ## 00000003 -/* 007E4 80887AD4 814A1CD0 */ lb $t2, 0x1CD0($t2) ## 00011CD0 -/* 007E8 80887AD8 3C0C8088 */ lui $t4, %hi(func_80887638) ## $t4 = 80880000 -/* 007EC 80887ADC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 007F0 80887AE0 152A0003 */ bne $t1, $t2, .L80887AF0 -/* 007F4 80887AE4 258C7638 */ addiu $t4, $t4, %lo(func_80887638) ## $t4 = 80887638 -/* 007F8 80887AE8 A20B0151 */ sb $t3, 0x0151($s0) ## 00000151 -/* 007FC 80887AEC AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -.L80887AF0: -/* 00800 80887AF0 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -.L80887AF4: -/* 00804 80887AF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00808 80887AF8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0080C 80887AFC 0320F809 */ jalr $ra, $t9 -/* 00810 80887B00 00000000 */ nop -/* 00814 80887B04 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00818 80887B08 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 0081C 80887B0C C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 00820 80887B10 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00824 80887B14 3C0D8016 */ lui $t5, %hi(gSaveContext+0x1360) -/* 00828 80887B18 46083281 */ sub.s $f10, $f6, $f8 -/* 0082C 80887B1C 4610503C */ c.lt.s $f10, $f16 -/* 00830 80887B20 00000000 */ nop -/* 00834 80887B24 45020026 */ bc1fl .L80887BC0 -/* 00838 80887B28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0083C 80887B2C 8DADF9C0 */ lw $t5, %lo(gSaveContext+0x1360)($t5) -/* 00840 80887B30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00844 80887B34 29A10004 */ slti $at, $t5, 0x0004 -/* 00848 80887B38 50200006 */ beql $at, $zero, .L80887B54 -/* 0084C 80887B3C C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 00850 80887B40 0C00BE5D */ jal func_8002F974 -/* 00854 80887B44 240520B3 */ addiu $a1, $zero, 0x20B3 ## $a1 = 000020B3 -/* 00858 80887B48 1000000E */ beq $zero, $zero, .L80887B84 -/* 0085C 80887B4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00860 80887B50 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -.L80887B54: -/* 00864 80887B54 2401FDFF */ addiu $at, $zero, 0xFDFF ## $at = FFFFFDFF -/* 00868 80887B58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0086C 80887B5C 4600910D */ trunc.w.s $f4, $f18 -/* 00870 80887B60 440F2000 */ mfc1 $t7, $f4 -/* 00874 80887B64 00000000 */ nop -/* 00878 80887B68 000FC400 */ sll $t8, $t7, 16 -/* 0087C 80887B6C 00184403 */ sra $t0, $t8, 16 -/* 00880 80887B70 55010004 */ bnel $t0, $at, .L80887B84 -/* 00884 80887B74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00888 80887B78 0C00BE5D */ jal func_8002F974 -/* 0088C 80887B7C 240520BB */ addiu $a1, $zero, 0x20BB ## $a1 = 000020BB -/* 00890 80887B80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80887B84: -/* 00894 80887B84 0C221E19 */ jal func_80887864 -/* 00898 80887B88 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0089C 80887B8C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008A0 80887B90 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 008A4 80887B94 02212821 */ addu $a1, $s1, $at -/* 008A8 80887B98 26060154 */ addiu $a2, $s0, 0x0154 ## $a2 = 00000154 -/* 008AC 80887B9C AFA60028 */ sw $a2, 0x0028($sp) -/* 008B0 80887BA0 AFA5002C */ sw $a1, 0x002C($sp) -/* 008B4 80887BA4 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 008B8 80887BA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008BC 80887BAC 8FA5002C */ lw $a1, 0x002C($sp) -/* 008C0 80887BB0 8FA60028 */ lw $a2, 0x0028($sp) -/* 008C4 80887BB4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 008C8 80887BB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008CC 80887BBC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80887BC0: -/* 008D0 80887BC0 8FB0001C */ lw $s0, 0x001C($sp) -/* 008D4 80887BC4 8FB10020 */ lw $s1, 0x0020($sp) -/* 008D8 80887BC8 03E00008 */ jr $ra -/* 008DC 80887BCC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s deleted file mode 100644 index bc59f13ebf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s +++ /dev/null @@ -1,43 +0,0 @@ -.late_rodata -glabel D_80887F48 - .word 0x445D599A -glabel D_80887F4C - .word 0x445D599A - -.text -glabel func_808874B0 -/* 001C0 808874B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001C4 808874B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001C8 808874B8 808F0150 */ lb $t7, 0x0150($a0) ## 00000150 -/* 001CC 808874BC 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 001D0 808874C0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 001D4 808874C4 000F0823 */ subu $at, $zero, $t7 -/* 001D8 808874C8 0001C380 */ sll $t8, $at, 14 -/* 001DC 808874CC 01D82021 */ addu $a0, $t6, $t8 -/* 001E0 808874D0 00042400 */ sll $a0, $a0, 16 -/* 001E4 808874D4 00042403 */ sra $a0, $a0, 16 -/* 001E8 808874D8 A7A4001E */ sh $a0, 0x001E($sp) -/* 001EC 808874DC 0C01DE1C */ jal Math_Sins - ## sins? -/* 001F0 808874E0 AFA50020 */ sw $a1, 0x0020($sp) -/* 001F4 808874E4 3C018088 */ lui $at, %hi(D_80887F48) ## $at = 80880000 -/* 001F8 808874E8 C4247F48 */ lwc1 $f4, %lo(D_80887F48)($at) -/* 001FC 808874EC 8FA50020 */ lw $a1, 0x0020($sp) -/* 00200 808874F0 87A4001E */ lh $a0, 0x001E($sp) -/* 00204 808874F4 46040182 */ mul.s $f6, $f0, $f4 -/* 00208 808874F8 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 0020C 808874FC 46083280 */ add.s $f10, $f6, $f8 -/* 00210 80887500 0C01DE0D */ jal Math_Coss - ## coss? -/* 00214 80887504 E4AA0024 */ swc1 $f10, 0x0024($a1) ## 00000024 -/* 00218 80887508 3C018088 */ lui $at, %hi(D_80887F4C) ## $at = 80880000 -/* 0021C 8088750C C4307F4C */ lwc1 $f16, %lo(D_80887F4C)($at) -/* 00220 80887510 8FA50020 */ lw $a1, 0x0020($sp) -/* 00224 80887514 46100482 */ mul.s $f18, $f0, $f16 -/* 00228 80887518 C4A40010 */ lwc1 $f4, 0x0010($a1) ## 00000010 -/* 0022C 8088751C 46049180 */ add.s $f6, $f18, $f4 -/* 00230 80887520 E4A6002C */ swc1 $f6, 0x002C($a1) ## 0000002C -/* 00234 80887524 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00238 80887528 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0023C 8088752C 03E00008 */ jr $ra -/* 00240 80887530 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s deleted file mode 100644 index ffb5c20c59..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80887534 -/* 00244 80887534 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00248 80887538 AFA40020 */ sw $a0, 0x0020($sp) -/* 0024C 8088753C 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00250 80887540 AFBF001C */ sw $ra, 0x001C($sp) -/* 00254 80887544 AFA50024 */ sw $a1, 0x0024($sp) -/* 00258 80887548 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0025C 8088754C 0C00B2D0 */ jal Flags_GetSwitch - -/* 00260 80887550 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C -/* 00264 80887554 1040000C */ beq $v0, $zero, .L80887588 -/* 00268 80887558 8FA70020 */ lw $a3, 0x0020($sp) -/* 0026C 8088755C 3C0F8088 */ lui $t7, %hi(func_80887598) ## $t7 = 80880000 -/* 00270 80887560 25EF7598 */ addiu $t7, $t7, %lo(func_80887598) ## $t7 = 80887598 -/* 00274 80887564 ACEF014C */ sw $t7, 0x014C($a3) ## 0000014C -/* 00278 80887568 AFA00010 */ sw $zero, 0x0010($sp) -/* 0027C 8088756C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00280 80887570 24050D0C */ addiu $a1, $zero, 0x0D0C ## $a1 = 00000D0C -/* 00284 80887574 0C02003E */ jal func_800800F8 -/* 00288 80887578 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 0028C 8088757C 8FB90020 */ lw $t9, 0x0020($sp) -/* 00290 80887580 24180023 */ addiu $t8, $zero, 0x0023 ## $t8 = 00000023 -/* 00294 80887584 A7380152 */ sh $t8, 0x0152($t9) ## 00000152 -.L80887588: -/* 00298 80887588 8FBF001C */ lw $ra, 0x001C($sp) -/* 0029C 8088758C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002A0 80887590 03E00008 */ jr $ra -/* 002A4 80887594 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s deleted file mode 100644 index 77030c07d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80887598 -/* 002A8 80887598 AFA50004 */ sw $a1, 0x0004($sp) -/* 002AC 8088759C 84830152 */ lh $v1, 0x0152($a0) ## 00000152 -/* 002B0 808875A0 3C0F8088 */ lui $t7, %hi(func_80887638) ## $t7 = 80880000 -/* 002B4 808875A4 25EF7638 */ addiu $t7, $t7, %lo(func_80887638) ## $t7 = 80887638 -/* 002B8 808875A8 2C620001 */ sltiu $v0, $v1, 0x0001 -/* 002BC 808875AC 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 002C0 808875B0 10400002 */ beq $v0, $zero, .L808875BC -/* 002C4 808875B4 A48E0152 */ sh $t6, 0x0152($a0) ## 00000152 -/* 002C8 808875B8 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -.L808875BC: -/* 002CC 808875BC 03E00008 */ jr $ra -/* 002D0 808875C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s deleted file mode 100644 index acd3e8be1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_808875C4 -/* 002D4 808875C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D8 808875C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002DC 808875CC AFA5001C */ sw $a1, 0x001C($sp) -/* 002E0 808875D0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 002E4 808875D4 8CE5000C */ lw $a1, 0x000C($a3) ## 0000000C -/* 002E8 808875D8 AFA70018 */ sw $a3, 0x0018($sp) -/* 002EC 808875DC 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 002F0 808875E0 0C01DE80 */ jal Math_ApproxF - -/* 002F4 808875E4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 002F8 808875E8 1040000F */ beq $v0, $zero, .L80887628 -/* 002FC 808875EC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00300 808875F0 80EE0150 */ lb $t6, 0x0150($a3) ## 00000150 -/* 00304 808875F4 3C188088 */ lui $t8, %hi(func_808877C4) ## $t8 = 80880000 -/* 00308 808875F8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0030C 808875FC 15C00009 */ bne $t6, $zero, .L80887624 -/* 00310 80887600 271877C4 */ addiu $t8, $t8, %lo(func_808877C4) ## $t8 = 808877C4 -/* 00314 80887604 84E5001C */ lh $a1, 0x001C($a3) ## 0000001C -/* 00318 80887608 0C00B2ED */ jal Flags_UnsetSwitch - -/* 0031C 8088760C AFA70018 */ sw $a3, 0x0018($sp) -/* 00320 80887610 8FA70018 */ lw $a3, 0x0018($sp) -/* 00324 80887614 3C0F8088 */ lui $t7, %hi(func_80887534) ## $t7 = 80880000 -/* 00328 80887618 25EF7534 */ addiu $t7, $t7, %lo(func_80887534) ## $t7 = 80887534 -/* 0032C 8088761C 10000002 */ beq $zero, $zero, .L80887628 -/* 00330 80887620 ACEF014C */ sw $t7, 0x014C($a3) ## 0000014C -.L80887624: -/* 00334 80887624 ACF8014C */ sw $t8, 0x014C($a3) ## 0000014C -.L80887628: -/* 00338 80887628 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0033C 8088762C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00340 80887630 03E00008 */ jr $ra -/* 00344 80887634 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s deleted file mode 100644 index cdb9a979c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80887638 -/* 00348 80887638 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0034C 8088763C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00350 80887640 AFA5001C */ sw $a1, 0x001C($sp) -/* 00354 80887644 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00358 80887648 3C014516 */ lui $at, 0x4516 ## $at = 45160000 -/* 0035C 8088764C 44812000 */ mtc1 $at, $f4 ## $f4 = 2400.00 -/* 00360 80887650 C4E60054 */ lwc1 $f6, 0x0054($a3) ## 00000054 -/* 00364 80887654 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -/* 00368 80887658 AFA70018 */ sw $a3, 0x0018($sp) -/* 0036C 8088765C 46062202 */ mul.s $f8, $f4, $f6 -/* 00370 80887660 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 00374 80887664 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 00378 80887668 46085401 */ sub.s $f16, $f10, $f8 -/* 0037C 8088766C 44058000 */ mfc1 $a1, $f16 -/* 00380 80887670 0C01DE80 */ jal Math_ApproxF - -/* 00384 80887674 00000000 */ nop -/* 00388 80887678 10400023 */ beq $v0, $zero, .L80887708 -/* 0038C 8088767C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00390 80887680 80E20150 */ lb $v0, 0x0150($a3) ## 00000150 -/* 00394 80887684 3C0E8088 */ lui $t6, %hi(func_80887718) ## $t6 = 80880000 -/* 00398 80887688 25CE7718 */ addiu $t6, $t6, %lo(func_80887718) ## $t6 = 80887718 -/* 0039C 8088768C 14400004 */ bne $v0, $zero, .L808876A0 -/* 003A0 80887690 240F0096 */ addiu $t7, $zero, 0x0096 ## $t7 = 00000096 -/* 003A4 80887694 ACEE014C */ sw $t6, 0x014C($a3) ## 0000014C -/* 003A8 80887698 1000001B */ beq $zero, $zero, .L80887708 -/* 003AC 8088769C A4EF0152 */ sh $t7, 0x0152($a3) ## 00000152 -.L808876A0: -/* 003B0 808876A0 90E30151 */ lbu $v1, 0x0151($a3) ## 00000151 -/* 003B4 808876A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 003B8 808876A8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 003BC 808876AC 14610005 */ bne $v1, $at, .L808876C4 -/* 003C0 808876B0 00000000 */ nop -/* 003C4 808876B4 0C00B55C */ jal Actor_Kill - -/* 003C8 808876B8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 003CC 808876BC 10000013 */ beq $zero, $zero, .L8088770C -/* 003D0 808876C0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808876C4: -/* 003D4 808876C4 14600007 */ bne $v1, $zero, .L808876E4 -/* 003D8 808876C8 0002C880 */ sll $t9, $v0, 2 -/* 003DC 808876CC 84F800B6 */ lh $t8, 0x00B6($a3) ## 000000B6 -/* 003E0 808876D0 0322C823 */ subu $t9, $t9, $v0 -/* 003E4 808876D4 0019CAC0 */ sll $t9, $t9, 11 -/* 003E8 808876D8 03194023 */ subu $t0, $t8, $t9 -/* 003EC 808876DC 10000004 */ beq $zero, $zero, .L808876F0 -/* 003F0 808876E0 A4E800B6 */ sh $t0, 0x00B6($a3) ## 000000B6 -.L808876E4: -/* 003F4 808876E4 84E90016 */ lh $t1, 0x0016($a3) ## 00000016 -/* 003F8 808876E8 A0E00151 */ sb $zero, 0x0151($a3) ## 00000151 -/* 003FC 808876EC A4E900B6 */ sh $t1, 0x00B6($a3) ## 000000B6 -.L808876F0: -/* 00400 808876F0 0C221D2C */ jal func_808874B0 -/* 00404 808876F4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00408 808876F8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0040C 808876FC 3C0A8088 */ lui $t2, %hi(func_808875C4) ## $t2 = 80880000 -/* 00410 80887700 254A75C4 */ addiu $t2, $t2, %lo(func_808875C4) ## $t2 = 808875C4 -/* 00414 80887704 ACEA014C */ sw $t2, 0x014C($a3) ## 0000014C -.L80887708: -/* 00418 80887708 8FBF0014 */ lw $ra, 0x0014($sp) -.L8088770C: -/* 0041C 8088770C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00420 80887710 03E00008 */ jr $ra -/* 00424 80887714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s deleted file mode 100644 index 19802b4bab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80887718 -/* 00428 80887718 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0042C 8088771C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00430 80887720 AFA5001C */ sw $a1, 0x001C($sp) -/* 00434 80887724 84850152 */ lh $a1, 0x0152($a0) ## 00000152 -/* 00438 80887728 3C0F8088 */ lui $t7, %hi(func_808875C4) ## $t7 = 80880000 -/* 0043C 8088772C 25EF75C4 */ addiu $t7, $t7, %lo(func_808875C4) ## $t7 = 808875C4 -/* 00440 80887730 10A00003 */ beq $a1, $zero, .L80887740 -/* 00444 80887734 24AEFFFF */ addiu $t6, $a1, 0xFFFF ## $t6 = FFFFFFFF -/* 00448 80887738 A48E0152 */ sh $t6, 0x0152($a0) ## 00000152 -/* 0044C 8088773C 84850152 */ lh $a1, 0x0152($a0) ## 00000152 -.L80887740: -/* 00450 80887740 14A00003 */ bne $a1, $zero, .L80887750 -/* 00454 80887744 00000000 */ nop -/* 00458 80887748 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -/* 0045C 8088774C 84850152 */ lh $a1, 0x0152($a0) ## 00000152 -.L80887750: -/* 00460 80887750 0C00BE65 */ jal func_8002F994 -/* 00464 80887754 00000000 */ nop -/* 00468 80887758 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0046C 8088775C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00470 80887760 03E00008 */ jr $ra -/* 00474 80887764 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s deleted file mode 100644 index e24a880623..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s +++ /dev/null @@ -1,30 +0,0 @@ -.late_rodata -glabel D_80887F50 - .float 1150.0 - -.text -glabel func_80887768 -/* 00478 80887768 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0047C 8088776C AFBF001C */ sw $ra, 0x001C($sp) -/* 00480 80887770 AFA50024 */ sw $a1, 0x0024($sp) -/* 00484 80887774 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00488 80887778 3C018088 */ lui $at, %hi(D_80887F50) ## $at = 80880000 -/* 0048C 8088777C C4267F50 */ lwc1 $f6, %lo(D_80887F50)($at) -/* 00490 80887780 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 00494 80887784 3C0F8088 */ lui $t7, %hi(func_808875C4) ## $t7 = 80880000 -/* 00498 80887788 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0049C 8088778C 4606203C */ c.lt.s $f4, $f6 -/* 004A0 80887790 25EF75C4 */ addiu $t7, $t7, %lo(func_808875C4) ## $t7 = 808875C4 -/* 004A4 80887794 24050CDA */ addiu $a1, $zero, 0x0CDA ## $a1 = 00000CDA -/* 004A8 80887798 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 004AC 8088779C 45020006 */ bc1fl .L808877B8 -/* 004B0 808877A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 004B4 808877A4 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -/* 004B8 808877A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 004BC 808877AC 0C02003E */ jal func_800800F8 -/* 004C0 808877B0 8FA40024 */ lw $a0, 0x0024($sp) -/* 004C4 808877B4 8FBF001C */ lw $ra, 0x001C($sp) -.L808877B8: -/* 004C8 808877B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004CC 808877BC 03E00008 */ jr $ra -/* 004D0 808877C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s deleted file mode 100644 index 4a58840297..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_808877C4 -/* 004D4 808877C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004D8 808877C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004DC 808877CC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004E0 808877D0 AFA70018 */ sw $a3, 0x0018($sp) -/* 004E4 808877D4 0C023A62 */ jal Player_InCsMode -/* 004E8 808877D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 004EC 808877DC 1440001D */ bne $v0, $zero, .L80887854 -/* 004F0 808877E0 8FA70018 */ lw $a3, 0x0018($sp) -/* 004F4 808877E4 80EF0150 */ lb $t7, 0x0150($a3) ## 00000150 -/* 004F8 808877E8 84EE0016 */ lh $t6, 0x0016($a3) ## 00000016 -/* 004FC 808877EC AFA70018 */ sw $a3, 0x0018($sp) -/* 00500 808877F0 000FC080 */ sll $t8, $t7, 2 -/* 00504 808877F4 030FC023 */ subu $t8, $t8, $t7 -/* 00508 808877F8 0018C0C0 */ sll $t8, $t8, 3 -/* 0050C 808877FC 030FC021 */ addu $t8, $t8, $t7 -/* 00510 80887800 0018C0C0 */ sll $t8, $t8, 3 -/* 00514 80887804 030FC023 */ subu $t8, $t8, $t7 -/* 00518 80887808 0018C0C0 */ sll $t8, $t8, 3 -/* 0051C 8088780C 030FC021 */ addu $t8, $t8, $t7 -/* 00520 80887810 0018C100 */ sll $t8, $t8, 4 -/* 00524 80887814 01D82821 */ addu $a1, $t6, $t8 -/* 00528 80887818 00052C00 */ sll $a1, $a1, 16 -/* 0052C 8088781C 00052C03 */ sra $a1, $a1, 16 -/* 00530 80887820 24E400B6 */ addiu $a0, $a3, 0x00B6 ## $a0 = 000000B6 -/* 00534 80887824 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00538 80887828 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 0053C 8088782C 10400007 */ beq $v0, $zero, .L8088784C -/* 00540 80887830 8FA70018 */ lw $a3, 0x0018($sp) -/* 00544 80887834 3C088088 */ lui $t0, %hi(func_80887638) ## $t0 = 80880000 -/* 00548 80887838 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0054C 8088783C 25087638 */ addiu $t0, $t0, %lo(func_80887638) ## $t0 = 80887638 -/* 00550 80887840 A0F90151 */ sb $t9, 0x0151($a3) ## 00000151 -/* 00554 80887844 10000003 */ beq $zero, $zero, .L80887854 -/* 00558 80887848 ACE8014C */ sw $t0, 0x014C($a3) ## 0000014C -.L8088784C: -/* 0055C 8088784C 0C221D2C */ jal func_808874B0 -/* 00560 80887850 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L80887854: -/* 00564 80887854 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00568 80887858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0056C 8088785C 03E00008 */ jr $ra -/* 00570 80887860 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s deleted file mode 100644 index cee82ba9c2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s +++ /dev/null @@ -1,138 +0,0 @@ -glabel func_80887864 -/* 00574 80887864 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00578 80887868 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0057C 8088786C AFA5003C */ sw $a1, 0x003C($sp) -/* 00580 80887870 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00584 80887874 AFA40038 */ sw $a0, 0x0038($sp) -/* 00588 80887878 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 -/* 0058C 8088787C 0C00B6F4 */ jal func_8002DBD0 -/* 00590 80887880 24460024 */ addiu $a2, $v0, 0x0024 ## $a2 = 00000024 -/* 00594 80887884 C7A40030 */ lwc1 $f4, 0x0030($sp) -/* 00598 80887888 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0059C 8088788C 8FA70038 */ lw $a3, 0x0038($sp) -/* 005A0 80887890 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 005A4 80887894 4604303E */ c.le.s $f6, $f4 -/* 005A8 80887898 00000000 */ nop -/* 005AC 8088789C 45020006 */ bc1fl .L808878B8 -/* 005B0 808878A0 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 005B4 808878A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 005B8 808878A8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 005BC 808878AC 10000004 */ beq $zero, $zero, .L808878C0 -/* 005C0 808878B0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 005C4 808878B4 44810000 */ mtc1 $at, $f0 ## $f0 = 25.00 -.L808878B8: -/* 005C8 808878B8 00000000 */ nop -/* 005CC 808878BC 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -.L808878C0: -/* 005D0 808878C0 44814000 */ mtc1 $at, $f8 ## $f8 = 25.00 -/* 005D4 808878C4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 005D8 808878C8 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 005DC 808878CC 46080282 */ mul.s $f10, $f0, $f8 -/* 005E0 808878D0 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 -/* 005E4 808878D4 C7A20028 */ lwc1 $f2, 0x0028($sp) -/* 005E8 808878D8 46105482 */ mul.s $f18, $f10, $f16 -/* 005EC 808878DC E7B20030 */ swc1 $f18, 0x0030($sp) -/* 005F0 808878E0 80EF0150 */ lb $t7, 0x0150($a3) ## 00000150 -/* 005F4 808878E4 55E00017 */ bnel $t7, $zero, .L80887944 -/* 005F8 808878E8 44810000 */ mtc1 $at, $f0 ## $f0 = -500.00 -/* 005FC 808878EC 3C01C3B4 */ lui $at, 0xC3B4 ## $at = C3B40000 -/* 00600 808878F0 44810000 */ mtc1 $at, $f0 ## $f0 = -360.00 -/* 00604 808878F4 C7A20028 */ lwc1 $f2, 0x0028($sp) -/* 00608 808878F8 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 -/* 0060C 808878FC 4600103C */ c.lt.s $f2, $f0 -/* 00610 80887900 00000000 */ nop -/* 00614 80887904 45020004 */ bc1fl .L80887918 -/* 00618 80887908 44816000 */ mtc1 $at, $f12 ## $f12 = 360.00 -/* 0061C 8088790C 1000001E */ beq $zero, $zero, .L80887988 -/* 00620 80887910 E7A00028 */ swc1 $f0, 0x0028($sp) -/* 00624 80887914 44816000 */ mtc1 $at, $f12 ## $f12 = 360.00 -.L80887918: -/* 00628 80887918 00000000 */ nop -/* 0062C 8088791C 4602603C */ c.lt.s $f12, $f2 -/* 00630 80887920 00000000 */ nop -/* 00634 80887924 45020004 */ bc1fl .L80887938 -/* 00638 80887928 46001006 */ mov.s $f0, $f2 -/* 0063C 8088792C 10000002 */ beq $zero, $zero, .L80887938 -/* 00640 80887930 46006006 */ mov.s $f0, $f12 -/* 00644 80887934 46001006 */ mov.s $f0, $f2 -.L80887938: -/* 00648 80887938 10000013 */ beq $zero, $zero, .L80887988 -/* 0064C 8088793C E7A00028 */ swc1 $f0, 0x0028($sp) -/* 00650 80887940 44810000 */ mtc1 $at, $f0 ## $f0 = 360.00 -.L80887944: -/* 00654 80887944 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 00658 80887948 4600103C */ c.lt.s $f2, $f0 -/* 0065C 8088794C 00000000 */ nop -/* 00660 80887950 45020004 */ bc1fl .L80887964 -/* 00664 80887954 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 -/* 00668 80887958 1000000B */ beq $zero, $zero, .L80887988 -/* 0066C 8088795C E7A00028 */ swc1 $f0, 0x0028($sp) -/* 00670 80887960 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 -.L80887964: -/* 00674 80887964 00000000 */ nop -/* 00678 80887968 4602603C */ c.lt.s $f12, $f2 -/* 0067C 8088796C 00000000 */ nop -/* 00680 80887970 45020004 */ bc1fl .L80887984 -/* 00684 80887974 46001006 */ mov.s $f0, $f2 -/* 00688 80887978 10000002 */ beq $zero, $zero, .L80887984 -/* 0068C 8088797C 46006006 */ mov.s $f0, $f12 -/* 00690 80887980 46001006 */ mov.s $f0, $f2 -.L80887984: -/* 00694 80887984 E7A00028 */ swc1 $f0, 0x0028($sp) -.L80887988: -/* 00698 80887988 84E400B6 */ lh $a0, 0x00B6($a3) ## 000000B6 -/* 0069C 8088798C 0C01DE1C */ jal Math_Sins - ## sins? -/* 006A0 80887990 AFA70038 */ sw $a3, 0x0038($sp) -/* 006A4 80887994 8FA70038 */ lw $a3, 0x0038($sp) -/* 006A8 80887998 84E400B6 */ lh $a0, 0x00B6($a3) ## 000000B6 -/* 006AC 8088799C 0C01DE0D */ jal Math_Coss - ## coss? -/* 006B0 808879A0 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 006B4 808879A4 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 006B8 808879A8 8FA70038 */ lw $a3, 0x0038($sp) -/* 006BC 808879AC C7A20020 */ lwc1 $f2, 0x0020($sp) -/* 006C0 808879B0 46003202 */ mul.s $f8, $f6, $f0 -/* 006C4 808879B4 C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 006C8 808879B8 C4E40024 */ lwc1 $f4, 0x0024($a3) ## 00000024 -/* 006CC 808879BC 46028482 */ mul.s $f18, $f16, $f2 -/* 006D0 808879C0 46082280 */ add.s $f10, $f4, $f8 -/* 006D4 808879C4 C4E8002C */ lwc1 $f8, 0x002C($a3) ## 0000002C -/* 006D8 808879C8 46125180 */ add.s $f6, $f10, $f18 -/* 006DC 808879CC 4600310D */ trunc.w.s $f4, $f6 -/* 006E0 808879D0 44192000 */ mfc1 $t9, $f4 -/* 006E4 808879D4 00000000 */ nop -/* 006E8 808879D8 A4F9019A */ sh $t9, 0x019A($a3) ## 0000019A -/* 006EC 808879DC C7B00028 */ lwc1 $f16, 0x0028($sp) -/* 006F0 808879E0 C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 006F4 808879E4 46028282 */ mul.s $f10, $f16, $f2 -/* 006F8 808879E8 460A4481 */ sub.s $f18, $f8, $f10 -/* 006FC 808879EC 46003102 */ mul.s $f4, $f6, $f0 -/* 00700 808879F0 C4EA0028 */ lwc1 $f10, 0x0028($a3) ## 00000028 -/* 00704 808879F4 4600518D */ trunc.w.s $f6, $f10 -/* 00708 808879F8 46049400 */ add.s $f16, $f18, $f4 -/* 0070C 808879FC 440B3000 */ mfc1 $t3, $f6 -/* 00710 80887A00 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00714 80887A04 4600820D */ trunc.w.s $f8, $f16 -/* 00718 80887A08 A4EB019C */ sh $t3, 0x019C($a3) ## 0000019C -/* 0071C 80887A0C 44094000 */ mfc1 $t1, $f8 -/* 00720 80887A10 00000000 */ nop -/* 00724 80887A14 A4E9019E */ sh $t1, 0x019E($a3) ## 0000019E -/* 00728 80887A18 C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 0072C 80887A1C 4604903C */ c.lt.s $f18, $f4 -/* 00730 80887A20 00000000 */ nop -/* 00734 80887A24 45020005 */ bc1fl .L80887A3C -/* 00738 80887A28 84ED00B6 */ lh $t5, 0x00B6($a3) ## 000000B6 -/* 0073C 80887A2C 84EC00B6 */ lh $t4, 0x00B6($a3) ## 000000B6 -/* 00740 80887A30 10000005 */ beq $zero, $zero, .L80887A48 -/* 00744 80887A34 A4EC0032 */ sh $t4, 0x0032($a3) ## 00000032 -/* 00748 80887A38 84ED00B6 */ lh $t5, 0x00B6($a3) ## 000000B6 -.L80887A3C: -/* 0074C 80887A3C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00750 80887A40 01A17021 */ addu $t6, $t5, $at -/* 00754 80887A44 A4EE0032 */ sh $t6, 0x0032($a3) ## 00000032 -.L80887A48: -/* 00758 80887A48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0075C 80887A4C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00760 80887A50 03E00008 */ jr $ra -/* 00764 80887A54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s deleted file mode 100644 index 13239db4ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel BgJyaBombchuiwa_Destroy -/* 000EC 8089458C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F0 80894590 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 000F4 80894594 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000F8 80894598 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000FC 8089459C 0C016F32 */ jal Collider_DestroyJntSph -/* 00100 808945A0 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 -/* 00104 808945A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00108 808945A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0010C 808945AC 03E00008 */ jr $ra -/* 00110 808945B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s deleted file mode 100644 index e5be1ee245..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel BgJyaBombchuiwa_Draw -/* 009BC 80894E5C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009C0 80894E60 AFBF001C */ sw $ra, 0x001C($sp) -/* 009C4 80894E64 AFB00018 */ sw $s0, 0x0018($sp) -/* 009C8 80894E68 AFA50024 */ sw $a1, 0x0024($sp) -/* 009CC 80894E6C 908201B6 */ lbu $v0, 0x01B6($a0) ## 000001B6 -/* 009D0 80894E70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009D4 80894E74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 009D8 80894E78 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 009DC 80894E7C 11C00007 */ beq $t6, $zero, .L80894E9C -/* 009E0 80894E80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 009E4 80894E84 0C00D498 */ jal Gfx_DrawDListOpa - -/* 009E8 80894E88 24A5E8D0 */ addiu $a1, $a1, 0xE8D0 ## $a1 = 0600E8D0 -/* 009EC 80894E8C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 009F0 80894E90 0C018A29 */ jal func_800628A4 -/* 009F4 80894E94 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 009F8 80894E98 920201B6 */ lbu $v0, 0x01B6($s0) ## 000001B6 -.L80894E9C: -/* 009FC 80894E9C 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 -/* 00A00 80894EA0 51E00005 */ beql $t7, $zero, .L80894EB8 -/* 00A04 80894EA4 30580004 */ andi $t8, $v0, 0x0004 ## $t8 = 00000000 -/* 00A08 80894EA8 0C2252C1 */ jal func_80894B04 -/* 00A0C 80894EAC 8FA40024 */ lw $a0, 0x0024($sp) -/* 00A10 80894EB0 920201B6 */ lbu $v0, 0x01B6($s0) ## 000001B6 -/* 00A14 80894EB4 30580004 */ andi $t8, $v0, 0x0004 ## $t8 = 00000000 -.L80894EB8: -/* 00A18 80894EB8 13000014 */ beq $t8, $zero, .L80894F0C -/* 00A1C 80894EBC 3C018089 */ lui $at, %hi(D_80894F88) ## $at = 80890000 -/* 00A20 80894EC0 3C068089 */ lui $a2, %hi(D_80894F90) ## $a2 = 80890000 -/* 00A24 80894EC4 3C078089 */ lui $a3, %hi(D_80894F94) ## $a3 = 80890000 -/* 00A28 80894EC8 24E74F94 */ addiu $a3, $a3, %lo(D_80894F94) ## $a3 = 80894F94 -/* 00A2C 80894ECC 8CC64F90 */ lw $a2, %lo(D_80894F90)($a2) -/* 00A30 80894ED0 C42C4F88 */ lwc1 $f12, %lo(D_80894F88)($at) -/* 00A34 80894ED4 0C0345A5 */ jal func_800D1694 -/* 00A38 80894ED8 C42E4F8C */ lwc1 $f14, %lo(D_80894F8C)($at) -/* 00A3C 80894EDC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 00A40 80894EE0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 00A44 80894EE4 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 00A48 80894EE8 0C0342A3 */ jal Matrix_Scale -/* 00A4C 80894EEC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A50 80894EF0 921901B6 */ lbu $t9, 0x01B6($s0) ## 000001B6 -/* 00A54 80894EF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A58 80894EF8 33280004 */ andi $t0, $t9, 0x0004 ## $t0 = 00000000 -/* 00A5C 80894EFC 51000004 */ beql $t0, $zero, .L80894F10 -/* 00A60 80894F00 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A64 80894F04 0C2252F2 */ jal func_80894BC8 -/* 00A68 80894F08 8FA50024 */ lw $a1, 0x0024($sp) -.L80894F0C: -/* 00A6C 80894F0C 8FBF001C */ lw $ra, 0x001C($sp) -.L80894F10: -/* 00A70 80894F10 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A74 80894F14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A78 80894F18 03E00008 */ jr $ra -/* 00A7C 80894F1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s deleted file mode 100644 index 30563f3fd1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel BgJyaBombchuiwa_Init -/* 00070 80894510 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00074 80894514 AFA50024 */ sw $a1, 0x0024($sp) -/* 00078 80894518 AFBF001C */ sw $ra, 0x001C($sp) -/* 0007C 8089451C AFB00018 */ sw $s0, 0x0018($sp) -/* 00080 80894520 3C058089 */ lui $a1, %hi(D_80894F74) ## $a1 = 80890000 -/* 00084 80894524 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00088 80894528 0C01E037 */ jal Actor_ProcessInitChain - -/* 0008C 8089452C 24A54F74 */ addiu $a1, $a1, %lo(D_80894F74) ## $a1 = 80894F74 -/* 00090 80894530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00094 80894534 0C225128 */ jal func_808944A0 -/* 00098 80894538 8FA50024 */ lw $a1, 0x0024($sp) -/* 0009C 8089453C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 000A0 80894540 8FA40024 */ lw $a0, 0x0024($sp) -/* 000A4 80894544 0C00B2D0 */ jal Flags_GetSwitch - -/* 000A8 80894548 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 000AC 8089454C 10400005 */ beq $v0, $zero, .L80894564 -/* 000B0 80894550 8FA50024 */ lw $a1, 0x0024($sp) -/* 000B4 80894554 0C225291 */ jal func_80894A44 -/* 000B8 80894558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000BC 8089455C 10000004 */ beq $zero, $zero, .L80894570 -/* 000C0 80894560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80894564: -/* 000C4 80894564 0C225210 */ jal func_80894840 -/* 000C8 80894568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000CC 8089456C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80894570: -/* 000D0 80894570 0C00B56E */ jal Actor_SetHeight - -/* 000D4 80894574 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 000D8 80894578 8FBF001C */ lw $ra, 0x001C($sp) -/* 000DC 8089457C 8FB00018 */ lw $s0, 0x0018($sp) -/* 000E0 80894580 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 000E4 80894584 03E00008 */ jr $ra -/* 000E8 80894588 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s deleted file mode 100644 index eb2f7e7a52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel BgJyaBombchuiwa_Update -/* 00638 80894AD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0063C 80894ADC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00640 80894AE0 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 00644 80894AE4 50400004 */ beql $v0, $zero, .L80894AF8 -/* 00648 80894AE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0064C 80894AEC 0040F809 */ jalr $ra, $v0 -/* 00650 80894AF0 00000000 */ nop -/* 00654 80894AF4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80894AF8: -/* 00658 80894AF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0065C 80894AFC 03E00008 */ jr $ra -/* 00660 80894B00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s deleted file mode 100644 index 98d164b357..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_808944A0 -/* 00000 808944A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00004 808944A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 808944A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0000C 808944AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 808944B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00014 808944B4 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 -/* 00018 808944B8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0001C 808944BC 0C016EFE */ jal Collider_InitJntSph -/* 00020 808944C0 AFA60028 */ sw $a2, 0x0028($sp) -/* 00024 808944C4 8FA60028 */ lw $a2, 0x0028($sp) -/* 00028 808944C8 3C078089 */ lui $a3, %hi(D_80894F64) ## $a3 = 80890000 -/* 0002C 808944CC 8FA50020 */ lw $a1, 0x0020($sp) -/* 00030 808944D0 24CE0170 */ addiu $t6, $a2, 0x0170 ## $t6 = 00000170 -/* 00034 808944D4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00038 808944D8 24E74F64 */ addiu $a3, $a3, %lo(D_80894F64) ## $a3 = 80894F64 -/* 0003C 808944DC 0C017014 */ jal Collider_SetJntSph -/* 00040 808944E0 8FA4002C */ lw $a0, 0x002C($sp) -/* 00044 808944E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00048 808944E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0004C 808944EC 03E00008 */ jr $ra -/* 00050 808944F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s deleted file mode 100644 index 1aa9cc753d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808944F4 -/* 00054 808944F4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00058 808944F8 908E01B6 */ lbu $t6, 0x01B6($a0) ## 000001B6 -/* 0005C 808944FC 31D8FFF8 */ andi $t8, $t6, 0xFFF8 ## $t8 = 00000000 -/* 00060 80894500 A09801B6 */ sb $t8, 0x01B6($a0) ## 000001B6 -/* 00064 80894504 0305C825 */ or $t9, $t8, $a1 ## $t9 = 00000000 -/* 00068 80894508 03E00008 */ jr $ra -/* 0006C 8089450C A09901B6 */ sb $t9, 0x01B6($a0) ## 000001B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s deleted file mode 100644 index de3c956a9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s +++ /dev/null @@ -1,185 +0,0 @@ -.late_rodata -glabel D_8089509C - .float 0.3 - -glabel D_808950A0 - .float 0.4 - -.text -glabel func_808945B4 -/* 00114 808945B4 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 -/* 00118 808945B8 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 0011C 808945BC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00120 808945C0 4481F000 */ mtc1 $at, $f30 ## $f30 = 3.00 -/* 00124 808945C4 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 00128 808945C8 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 0012C 808945CC 4481E000 */ mtc1 $at, $f28 ## $f28 = 25.00 -/* 00130 808945D0 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00134 808945D4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00138 808945D8 4481D000 */ mtc1 $at, $f26 ## $f26 = 50.00 -/* 0013C 808945DC F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 00140 808945E0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00144 808945E4 4481C000 */ mtc1 $at, $f24 ## $f24 = 40.00 -/* 00148 808945E8 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 0014C 808945EC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00150 808945F0 4481B000 */ mtc1 $at, $f22 ## $f22 = 20.00 -/* 00154 808945F4 AFBE0098 */ sw $s8, 0x0098($sp) -/* 00158 808945F8 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 0015C 808945FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00160 80894600 AFB70094 */ sw $s7, 0x0094($sp) -/* 00164 80894604 AFB60090 */ sw $s6, 0x0090($sp) -/* 00168 80894608 AFB5008C */ sw $s5, 0x008C($sp) -/* 0016C 8089460C AFB40088 */ sw $s4, 0x0088($sp) -/* 00170 80894610 3C1E0601 */ lui $s8, 0x0601 ## $s8 = 06010000 -/* 00174 80894614 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 -/* 00178 80894618 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 -/* 0017C 8089461C AFBF009C */ sw $ra, 0x009C($sp) -/* 00180 80894620 AFB30084 */ sw $s3, 0x0084($sp) -/* 00184 80894624 AFB20080 */ sw $s2, 0x0080($sp) -/* 00188 80894628 AFB1007C */ sw $s1, 0x007C($sp) -/* 0018C 8089462C AFB00078 */ sw $s0, 0x0078($sp) -/* 00190 80894630 AFA500CC */ sw $a1, 0x00CC($sp) -/* 00194 80894634 27DEEDC0 */ addiu $s8, $s8, 0xEDC0 ## $s8 = 0600EDC0 -/* 00198 80894638 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0019C 8089463C 27B600BC */ addiu $s6, $sp, 0x00BC ## $s6 = FFFFFFF4 -/* 001A0 80894640 27B700B0 */ addiu $s7, $sp, 0x00B0 ## $s7 = FFFFFFE8 -/* 001A4 80894644 2412000C */ addiu $s2, $zero, 0x000C ## $s2 = 0000000C -.L80894648: -/* 001A8 80894648 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001AC 8089464C 24130008 */ addiu $s3, $zero, 0x0008 ## $s3 = 00000008 -/* 001B0 80894650 46140102 */ mul.s $f4, $f0, $f20 -/* 001B4 80894654 C6A60024 */ lwc1 $f6, 0x0024($s5) ## 00000024 -/* 001B8 80894658 46062200 */ add.s $f8, $f4, $f6 -/* 001BC 8089465C 46144281 */ sub.s $f10, $f8, $f20 -/* 001C0 80894660 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001C4 80894664 E7AA00BC */ swc1 $f10, 0x00BC($sp) -/* 001C8 80894668 46180402 */ mul.s $f16, $f0, $f24 -/* 001CC 8089466C C6B20028 */ lwc1 $f18, 0x0028($s5) ## 00000028 -/* 001D0 80894670 46128100 */ add.s $f4, $f16, $f18 -/* 001D4 80894674 46162181 */ sub.s $f6, $f4, $f22 -/* 001D8 80894678 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001DC 8089467C E7A600C0 */ swc1 $f6, 0x00C0($sp) -/* 001E0 80894680 461A0202 */ mul.s $f8, $f0, $f26 -/* 001E4 80894684 C6AA002C */ lwc1 $f10, 0x002C($s5) ## 0000002C -/* 001E8 80894688 460A4400 */ add.s $f16, $f8, $f10 -/* 001EC 8089468C 461C8481 */ sub.s $f18, $f16, $f28 -/* 001F0 80894690 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001F4 80894694 E7B200C4 */ swc1 $f18, 0x00C4($sp) -/* 001F8 80894698 461E0102 */ mul.s $f4, $f0, $f30 -/* 001FC 8089469C 3C018089 */ lui $at, %hi(D_8089509C) ## $at = 80890000 -/* 00200 808946A0 C426509C */ lwc1 $f6, %lo(D_8089509C)($at) -/* 00204 808946A4 46062201 */ sub.s $f8, $f4, $f6 -/* 00208 808946A8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0020C 808946AC E7A800B0 */ swc1 $f8, 0x00B0($sp) -/* 00210 808946B0 3C014190 */ lui $at, 0x4190 ## $at = 41900000 -/* 00214 808946B4 44815000 */ mtc1 $at, $f10 ## $f10 = 18.00 -/* 00218 808946B8 00000000 */ nop -/* 0021C 808946BC 460A0402 */ mul.s $f16, $f0, $f10 -/* 00220 808946C0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00224 808946C4 E7B000B4 */ swc1 $f16, 0x00B4($sp) -/* 00228 808946C8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0022C 808946CC 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 00230 808946D0 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00234 808946D4 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 00238 808946D8 46120101 */ sub.s $f4, $f0, $f18 -/* 0023C 808946DC 46062202 */ mul.s $f8, $f4, $f6 -/* 00240 808946E0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00244 808946E4 E7A800B8 */ swc1 $f8, 0x00B8($sp) -/* 00248 808946E8 46160282 */ mul.s $f10, $f0, $f22 -/* 0024C 808946EC 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 -/* 00250 808946F0 4600540D */ trunc.w.s $f16, $f10 -/* 00254 808946F4 44028000 */ mfc1 $v0, $f16 -/* 00258 808946F8 00000000 */ nop -/* 0025C 808946FC 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00260 80894700 00027C00 */ sll $t7, $v0, 16 -/* 00264 80894704 000FC403 */ sra $t8, $t7, 16 -/* 00268 80894708 00028C00 */ sll $s1, $v0, 16 -/* 0026C 8089470C 2B01000B */ slti $at, $t8, 0x000B -/* 00270 80894710 14200003 */ bne $at, $zero, .L80894720 -/* 00274 80894714 00118C03 */ sra $s1, $s1, 16 -/* 00278 80894718 10000001 */ beq $zero, $zero, .L80894720 -/* 0027C 8089471C 24100005 */ addiu $s0, $zero, 0x0005 ## $s0 = 00000005 -.L80894720: -/* 00280 80894720 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00284 80894724 00000000 */ nop -/* 00288 80894728 3C018089 */ lui $at, %hi(D_808950A0) ## $at = 80890000 -/* 0028C 8089472C C43250A0 */ lwc1 $f18, %lo(D_808950A0)($at) -/* 00290 80894730 8FA400CC */ lw $a0, 0x00CC($sp) -/* 00294 80894734 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFF4 -/* 00298 80894738 4612003C */ c.lt.s $f0, $f18 -/* 0029C 8089473C 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFE8 -/* 002A0 80894740 02C03825 */ or $a3, $s6, $zero ## $a3 = FFFFFFF4 -/* 002A4 80894744 2419FED4 */ addiu $t9, $zero, 0xFED4 ## $t9 = FFFFFED4 -/* 002A8 80894748 45000005 */ bc1f .L80894760 -/* 002AC 8089474C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 002B0 80894750 36100040 */ ori $s0, $s0, 0x0040 ## $s0 = 00000045 -/* 002B4 80894754 00108400 */ sll $s0, $s0, 16 -/* 002B8 80894758 10000008 */ beq $zero, $zero, .L8089477C -/* 002BC 8089475C 00108403 */ sra $s0, $s0, 16 -.L80894760: -/* 002C0 80894760 36100020 */ ori $s0, $s0, 0x0020 ## $s0 = 00000065 -/* 002C4 80894764 00108400 */ sll $s0, $s0, 16 -/* 002C8 80894768 2A210008 */ slti $at, $s1, 0x0008 -/* 002CC 8089476C 10200003 */ beq $at, $zero, .L8089477C -/* 002D0 80894770 00108403 */ sra $s0, $s0, 16 -/* 002D4 80894774 24120046 */ addiu $s2, $zero, 0x0046 ## $s2 = 00000046 -/* 002D8 80894778 24130028 */ addiu $s3, $zero, 0x0028 ## $s3 = 00000028 -.L8089477C: -/* 002DC 8089477C 2409000F */ addiu $t1, $zero, 0x000F ## $t1 = 0000000F -/* 002E0 80894780 240A0050 */ addiu $t2, $zero, 0x0050 ## $t2 = 00000050 -/* 002E4 80894784 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 002E8 80894788 240C00F1 */ addiu $t4, $zero, 0x00F1 ## $t4 = 000000F1 -/* 002EC 8089478C AFAC0038 */ sw $t4, 0x0038($sp) -/* 002F0 80894790 AFAB0034 */ sw $t3, 0x0034($sp) -/* 002F4 80894794 AFAA0030 */ sw $t2, 0x0030($sp) -/* 002F8 80894798 AFA9002C */ sw $t1, 0x002C($sp) -/* 002FC 8089479C AFB90010 */ sw $t9, 0x0010($sp) -/* 00300 808947A0 AFB00014 */ sw $s0, 0x0014($sp) -/* 00304 808947A4 AFB20018 */ sw $s2, 0x0018($sp) -/* 00308 808947A8 AFB3001C */ sw $s3, 0x001C($sp) -/* 0030C 808947AC AFA00020 */ sw $zero, 0x0020($sp) -/* 00310 808947B0 AFB10024 */ sw $s1, 0x0024($sp) -/* 00314 808947B4 AFA80028 */ sw $t0, 0x0028($sp) -/* 00318 808947B8 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 0031C 808947BC AFBE003C */ sw $s8, 0x003C($sp) -/* 00320 808947C0 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 00324 808947C4 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00328 808947C8 5681FF9F */ bnel $s4, $at, .L80894648 -/* 0032C 808947CC 2412000C */ addiu $s2, $zero, 0x000C ## $s2 = 0000000C -/* 00330 808947D0 240D0064 */ addiu $t5, $zero, 0x0064 ## $t5 = 00000064 -/* 00334 808947D4 240E00A0 */ addiu $t6, $zero, 0x00A0 ## $t6 = 000000A0 -/* 00338 808947D8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0033C 808947DC AFAD0010 */ sw $t5, 0x0010($sp) -/* 00340 808947E0 8FA400CC */ lw $a0, 0x00CC($sp) -/* 00344 808947E4 26A50024 */ addiu $a1, $s5, 0x0024 ## $a1 = 00000024 -/* 00348 808947E8 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 0034C 808947EC 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 00350 808947F0 0C00CD20 */ jal func_80033480 -/* 00354 808947F4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00358 808947F8 8FBF009C */ lw $ra, 0x009C($sp) -/* 0035C 808947FC D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00360 80894800 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00364 80894804 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00368 80894808 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 0036C 8089480C D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00370 80894810 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00374 80894814 8FB00078 */ lw $s0, 0x0078($sp) -/* 00378 80894818 8FB1007C */ lw $s1, 0x007C($sp) -/* 0037C 8089481C 8FB20080 */ lw $s2, 0x0080($sp) -/* 00380 80894820 8FB30084 */ lw $s3, 0x0084($sp) -/* 00384 80894824 8FB40088 */ lw $s4, 0x0088($sp) -/* 00388 80894828 8FB5008C */ lw $s5, 0x008C($sp) -/* 0038C 8089482C 8FB60090 */ lw $s6, 0x0090($sp) -/* 00390 80894830 8FB70094 */ lw $s7, 0x0094($sp) -/* 00394 80894834 8FBE0098 */ lw $s8, 0x0098($sp) -/* 00398 80894838 03E00008 */ jr $ra -/* 0039C 8089483C 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s deleted file mode 100644 index 352ec3e453..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80894840 -/* 003A0 80894840 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003A4 80894844 3C0E8089 */ lui $t6, %hi(func_8089487C) ## $t6 = 80890000 -/* 003A8 80894848 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003AC 8089484C AFA5001C */ sw $a1, 0x001C($sp) -/* 003B0 80894850 25CE487C */ addiu $t6, $t6, %lo(func_8089487C) ## $t6 = 8089487C -/* 003B4 80894854 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 003B8 80894858 AFA40018 */ sw $a0, 0x0018($sp) -/* 003BC 8089485C 0C22513D */ jal func_808944F4 -/* 003C0 80894860 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 003C4 80894864 8FA40018 */ lw $a0, 0x0018($sp) -/* 003C8 80894868 A48001B4 */ sh $zero, 0x01B4($a0) ## 000001B4 -/* 003CC 8089486C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003D0 80894870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003D4 80894874 03E00008 */ jr $ra -/* 003D8 80894878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s deleted file mode 100644 index 462aad157d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_8089487C -/* 003DC 8089487C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 003E0 80894880 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003E4 80894884 AFB10020 */ sw $s1, 0x0020($sp) -/* 003E8 80894888 AFB0001C */ sw $s0, 0x001C($sp) -/* 003EC 8089488C 908E0161 */ lbu $t6, 0x0161($a0) ## 00000161 -/* 003F0 80894890 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003F4 80894894 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 003F8 80894898 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 003FC 8089489C 55E00007 */ bnel $t7, $zero, .L808948BC -/* 00400 808948A0 860201B4 */ lh $v0, 0x01B4($s0) ## 000001B4 -/* 00404 808948A4 849801B4 */ lh $t8, 0x01B4($a0) ## 000001B4 -/* 00408 808948A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0040C 808948AC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00410 808948B0 1B00001D */ blez $t8, .L80894928 -/* 00414 808948B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00418 808948B8 860201B4 */ lh $v0, 0x01B4($s0) ## 000001B4 -.L808948BC: -/* 0041C 808948BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00420 808948C0 24050D52 */ addiu $a1, $zero, 0x0D52 ## $a1 = 00000D52 -/* 00424 808948C4 14400005 */ bne $v0, $zero, .L808948DC -/* 00428 808948C8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 0042C 808948CC 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00430 808948D0 0C02003E */ jal func_800800F8 -/* 00434 808948D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00438 808948D8 860201B4 */ lh $v0, 0x01B4($s0) ## 000001B4 -.L808948DC: -/* 0043C 808948DC 24590001 */ addiu $t9, $v0, 0x0001 ## $t9 = 00000001 -/* 00440 808948E0 A61901B4 */ sh $t9, 0x01B4($s0) ## 000001B4 -/* 00444 808948E4 860801B4 */ lh $t0, 0x01B4($s0) ## 000001B4 -/* 00448 808948E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0044C 808948EC 2901000B */ slti $at, $t0, 0x000B -/* 00450 808948F0 54200017 */ bnel $at, $zero, .L80894950 -/* 00454 808948F4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00458 808948F8 0C22516D */ jal func_808945B4 -/* 0045C 808948FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00460 80894900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00464 80894904 0C225258 */ jal func_80894960 -/* 00468 80894908 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0046C 8089490C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00470 80894910 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00474 80894914 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 00478 80894918 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 0047C 8089491C 24072810 */ addiu $a3, $zero, 0x2810 ## $a3 = 00002810 -/* 00480 80894920 1000000B */ beq $zero, $zero, .L80894950 -/* 00484 80894924 8FBF0024 */ lw $ra, 0x0024($sp) -.L80894928: -/* 00488 80894928 02212821 */ addu $a1, $s1, $at -/* 0048C 8089492C 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -/* 00490 80894930 AFA60028 */ sw $a2, 0x0028($sp) -/* 00494 80894934 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00498 80894938 AFA5002C */ sw $a1, 0x002C($sp) -/* 0049C 8089493C 8FA5002C */ lw $a1, 0x002C($sp) -/* 004A0 80894940 8FA60028 */ lw $a2, 0x0028($sp) -/* 004A4 80894944 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 004A8 80894948 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004AC 8089494C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80894950: -/* 004B0 80894950 8FB0001C */ lw $s0, 0x001C($sp) -/* 004B4 80894954 8FB10020 */ lw $s1, 0x0020($sp) -/* 004B8 80894958 03E00008 */ jr $ra -/* 004BC 8089495C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s deleted file mode 100644 index 4df7c64c6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s +++ /dev/null @@ -1,28 +0,0 @@ -.late_rodata -glabel D_808950A4 - .float 0.3 - -.text -glabel func_80894960 -/* 004C0 80894960 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C4 80894964 3C0E8089 */ lui $t6, %hi(func_808949B8) ## $t6 = 80890000 -/* 004C8 80894968 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004CC 8089496C AFA5001C */ sw $a1, 0x001C($sp) -/* 004D0 80894970 25CE49B8 */ addiu $t6, $t6, %lo(func_808949B8) ## $t6 = 808949B8 -/* 004D4 80894974 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 004D8 80894978 AFA40018 */ sw $a0, 0x0018($sp) -/* 004DC 8089497C 0C22513D */ jal func_808944F4 -/* 004E0 80894980 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 004E4 80894984 8FA40018 */ lw $a0, 0x0018($sp) -/* 004E8 80894988 3C018089 */ lui $at, %hi(D_808950A4) ## $at = 80890000 -/* 004EC 8089498C C42450A4 */ lwc1 $f4, %lo(D_808950A4)($at) -/* 004F0 80894990 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 004F4 80894994 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 004F8 80894998 A48001B4 */ sh $zero, 0x01B4($a0) ## 000001B4 -/* 004FC 8089499C 01E1C024 */ and $t8, $t7, $at -/* 00500 808949A0 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 00504 808949A4 E48401B0 */ swc1 $f4, 0x01B0($a0) ## 000001B0 -/* 00508 808949A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0050C 808949AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00510 808949B0 03E00008 */ jr $ra -/* 00514 808949B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s deleted file mode 100644 index e97d311330..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_808949B8 -/* 00518 808949B8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0051C 808949BC AFBF002C */ sw $ra, 0x002C($sp) -/* 00520 808949C0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00524 808949C4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00528 808949C8 848E01B4 */ lh $t6, 0x01B4($a0) ## 000001B4 -/* 0052C 808949CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00530 808949D0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00534 808949D4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00538 808949D8 A48F01B4 */ sh $t7, 0x01B4($a0) ## 000001B4 -/* 0053C 808949DC 849801B4 */ lh $t8, 0x01B4($a0) ## 000001B4 -/* 00540 808949E0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00544 808949E4 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 -/* 00548 808949E8 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 0054C 808949EC 13200007 */ beq $t9, $zero, .L80894A0C -/* 00550 808949F0 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00554 808949F4 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 00558 808949F8 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 0055C 808949FC AFA90014 */ sw $t1, 0x0014($sp) -/* 00560 80894A00 AFA80010 */ sw $t0, 0x0010($sp) -/* 00564 80894A04 0C00CD20 */ jal func_80033480 -/* 00568 80894A08 AFA00018 */ sw $zero, 0x0018($sp) -.L80894A0C: -/* 0056C 80894A0C 3C063CE5 */ lui $a2, 0x3CE5 ## $a2 = 3CE50000 -/* 00570 80894A10 34C66042 */ ori $a2, $a2, 0x6042 ## $a2 = 3CE56042 -/* 00574 80894A14 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 -/* 00578 80894A18 0C01DE80 */ jal Math_ApproxF - -/* 0057C 80894A1C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00580 80894A20 10400003 */ beq $v0, $zero, .L80894A30 -/* 00584 80894A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00588 80894A28 0C225291 */ jal func_80894A44 -/* 0058C 80894A2C 8FA50034 */ lw $a1, 0x0034($sp) -.L80894A30: -/* 00590 80894A30 8FBF002C */ lw $ra, 0x002C($sp) -/* 00594 80894A34 8FB00028 */ lw $s0, 0x0028($sp) -/* 00598 80894A38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0059C 80894A3C 03E00008 */ jr $ra -/* 005A0 80894A40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s deleted file mode 100644 index 8b8848eafa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s +++ /dev/null @@ -1,51 +0,0 @@ -.rdata -glabel D_80894FA0 - .asciz "Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80894FD8 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -.text -glabel func_80894A44 -/* 005A4 80894A44 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 005A8 80894A48 3C014319 */ lui $at, 0x4319 ## $at = 43190000 -/* 005AC 80894A4C 44812000 */ mtc1 $at, $f4 ## $f4 = 153.00 -/* 005B0 80894A50 AFBF0034 */ sw $ra, 0x0034($sp) -/* 005B4 80894A54 AFB00030 */ sw $s0, 0x0030($sp) -/* 005B8 80894A58 AFA5003C */ sw $a1, 0x003C($sp) -/* 005BC 80894A5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005C0 80894A60 AC80014C */ sw $zero, 0x014C($a0) ## 0000014C -/* 005C4 80894A64 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 005C8 80894A68 0C22513D */ jal func_808944F4 -/* 005CC 80894A6C E48401B0 */ swc1 $f4, 0x01B0($a0) ## 000001B0 -/* 005D0 80894A70 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 005D4 80894A74 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 005D8 80894A78 8FA5003C */ lw $a1, 0x003C($sp) -/* 005DC 80894A7C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 005E0 80894A80 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 005E4 80894A84 AFA00024 */ sw $zero, 0x0024($sp) -/* 005E8 80894A88 AFA00020 */ sw $zero, 0x0020($sp) -/* 005EC 80894A8C AFA0001C */ sw $zero, 0x001C($sp) -/* 005F0 80894A90 AFA00018 */ sw $zero, 0x0018($sp) -/* 005F4 80894A94 240600B7 */ addiu $a2, $zero, 0x00B7 ## $a2 = 000000B7 -/* 005F8 80894A98 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 005FC 80894A9C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00600 80894AA0 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00604 80894AA4 14400007 */ bne $v0, $zero, .L80894AC4 -/* 00608 80894AA8 3C048089 */ lui $a0, %hi(D_80894FA0) ## $a0 = 80890000 -/* 0060C 80894AAC 3C058089 */ lui $a1, %hi(D_80894FD8) ## $a1 = 80890000 -/* 00610 80894AB0 24A54FD8 */ addiu $a1, $a1, %lo(D_80894FD8) ## $a1 = 80894FD8 -/* 00614 80894AB4 24844FA0 */ addiu $a0, $a0, %lo(D_80894FA0) ## $a0 = 80894FA0 -/* 00618 80894AB8 2406019A */ addiu $a2, $zero, 0x019A ## $a2 = 0000019A -/* 0061C 80894ABC 0C00084C */ jal osSyncPrintf - -/* 00620 80894AC0 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -.L80894AC4: -/* 00624 80894AC4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00628 80894AC8 8FB00030 */ lw $s0, 0x0030($sp) -/* 0062C 80894ACC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00630 80894AD0 03E00008 */ jr $ra -/* 00634 80894AD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s deleted file mode 100644 index 0f672148f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s +++ /dev/null @@ -1,64 +0,0 @@ -.rdata -glabel D_80894FF4 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80895010 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_8089502C - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -.text -glabel func_80894B04 -/* 00664 80894B04 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00668 80894B08 AFBF001C */ sw $ra, 0x001C($sp) -/* 0066C 80894B0C AFB00018 */ sw $s0, 0x0018($sp) -/* 00670 80894B10 AFA40040 */ sw $a0, 0x0040($sp) -/* 00674 80894B14 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 00678 80894B18 3C068089 */ lui $a2, %hi(D_80894FF4) ## $a2 = 80890000 -/* 0067C 80894B1C 24C64FF4 */ addiu $a2, $a2, %lo(D_80894FF4) ## $a2 = 80894FF4 -/* 00680 80894B20 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 00684 80894B24 240701B4 */ addiu $a3, $zero, 0x01B4 ## $a3 = 000001B4 -/* 00688 80894B28 0C031AB1 */ jal Graph_OpenDisps -/* 0068C 80894B2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00690 80894B30 8FAF0040 */ lw $t7, 0x0040($sp) -/* 00694 80894B34 0C024F61 */ jal func_80093D84 -/* 00698 80894B38 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0069C 80894B3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 006A0 80894B40 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 006A4 80894B44 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 006A8 80894B48 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 006AC 80894B4C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 006B0 80894B50 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 006B4 80894B54 8FA80040 */ lw $t0, 0x0040($sp) -/* 006B8 80894B58 3C058089 */ lui $a1, %hi(D_80895010) ## $a1 = 80890000 -/* 006BC 80894B5C 24A55010 */ addiu $a1, $a1, %lo(D_80895010) ## $a1 = 80895010 -/* 006C0 80894B60 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 006C4 80894B64 240601B7 */ addiu $a2, $zero, 0x01B7 ## $a2 = 000001B7 -/* 006C8 80894B68 0C0346A2 */ jal Matrix_NewMtx -/* 006CC 80894B6C AFA20028 */ sw $v0, 0x0028($sp) -/* 006D0 80894B70 8FA30028 */ lw $v1, 0x0028($sp) -/* 006D4 80894B74 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 006D8 80894B78 256B19B0 */ addiu $t3, $t3, 0x19B0 ## $t3 = 060119B0 -/* 006DC 80894B7C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 006E0 80894B80 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 006E4 80894B84 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 006E8 80894B88 3C068089 */ lui $a2, %hi(D_8089502C) ## $a2 = 80890000 -/* 006EC 80894B8C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 006F0 80894B90 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 006F4 80894B94 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 006F8 80894B98 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 006FC 80894B9C 8FAC0040 */ lw $t4, 0x0040($sp) -/* 00700 80894BA0 24C6502C */ addiu $a2, $a2, %lo(D_8089502C) ## $a2 = 8089502C -/* 00704 80894BA4 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 00708 80894BA8 240701BB */ addiu $a3, $zero, 0x01BB ## $a3 = 000001BB -/* 0070C 80894BAC 0C031AD5 */ jal Graph_CloseDisps -/* 00710 80894BB0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00714 80894BB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00718 80894BB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0071C 80894BBC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00720 80894BC0 03E00008 */ jr $ra -/* 00724 80894BC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s deleted file mode 100644 index 71b18e9d92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s +++ /dev/null @@ -1,188 +0,0 @@ -.rdata -glabel D_80895048 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80895064 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80895080 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -.text -glabel func_80894BC8 -/* 00728 80894BC8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0072C 80894BCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00730 80894BD0 AFA40058 */ sw $a0, 0x0058($sp) -/* 00734 80894BD4 AFA5005C */ sw $a1, 0x005C($sp) -/* 00738 80894BD8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0073C 80894BDC 3C068089 */ lui $a2, %hi(D_80895048) ## $a2 = 80890000 -/* 00740 80894BE0 24C65048 */ addiu $a2, $a2, %lo(D_80895048) ## $a2 = 80895048 -/* 00744 80894BE4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 00748 80894BE8 240701C5 */ addiu $a3, $zero, 0x01C5 ## $a3 = 000001C5 -/* 0074C 80894BEC 0C031AB1 */ jal Graph_OpenDisps -/* 00750 80894BF0 AFA50050 */ sw $a1, 0x0050($sp) -/* 00754 80894BF4 8FAF005C */ lw $t7, 0x005C($sp) -/* 00758 80894BF8 0C024F61 */ jal func_80093D84 -/* 0075C 80894BFC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00760 80894C00 8FA80050 */ lw $t0, 0x0050($sp) -/* 00764 80894C04 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00768 80894C08 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 0076C 80894C0C 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 00770 80894C10 3C058089 */ lui $a1, %hi(D_80895064) ## $a1 = 80890000 -/* 00774 80894C14 24A55064 */ addiu $a1, $a1, %lo(D_80895064) ## $a1 = 80895064 -/* 00778 80894C18 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0077C 80894C1C AD1802D0 */ sw $t8, 0x02D0($t0) ## 000002D0 -/* 00780 80894C20 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00784 80894C24 8FAA005C */ lw $t2, 0x005C($sp) -/* 00788 80894C28 240601C9 */ addiu $a2, $zero, 0x01C9 ## $a2 = 000001C9 -/* 0078C 80894C2C 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 00790 80894C30 AFA80050 */ sw $t0, 0x0050($sp) -/* 00794 80894C34 0C0346A2 */ jal Matrix_NewMtx -/* 00798 80894C38 AFA2003C */ sw $v0, 0x003C($sp) -/* 0079C 80894C3C 8FA3003C */ lw $v1, 0x003C($sp) -/* 007A0 80894C40 8FA80050 */ lw $t0, 0x0050($sp) -/* 007A4 80894C44 3C06FA00 */ lui $a2, 0xFA00 ## $a2 = FA000000 -/* 007A8 80894C48 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 007AC 80894C4C 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 -/* 007B0 80894C50 8FA50058 */ lw $a1, 0x0058($sp) -/* 007B4 80894C54 3C014319 */ lui $at, 0x4319 ## $at = 43190000 -/* 007B8 80894C58 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 007BC 80894C5C AD0B02D0 */ sw $t3, 0x02D0($t0) ## 000002D0 -/* 007C0 80894C60 AC660000 */ sw $a2, 0x0000($v1) ## 00000000 -/* 007C4 80894C64 44813000 */ mtc1 $at, $f6 ## $f6 = 153.00 -/* 007C8 80894C68 C4A401B0 */ lwc1 $f4, 0x01B0($a1) ## 000001B0 -/* 007CC 80894C6C 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 007D0 80894C70 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 007D4 80894C74 46062202 */ mul.s $f8, $f4, $f6 -/* 007D8 80894C78 2407FF00 */ addiu $a3, $zero, 0xFF00 ## $a3 = FFFFFF00 -/* 007DC 80894C7C 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 007E0 80894C80 444CF800 */ cfc1 $t4, $31 -/* 007E4 80894C84 44C4F800 */ ctc1 $a0, $31 -/* 007E8 80894C88 00000000 */ nop -/* 007EC 80894C8C 460042A4 */ cvt.w.s $f10, $f8 -/* 007F0 80894C90 4444F800 */ cfc1 $a0, $31 -/* 007F4 80894C94 00000000 */ nop -/* 007F8 80894C98 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 007FC 80894C9C 50800013 */ beql $a0, $zero, .L80894CEC -/* 00800 80894CA0 44045000 */ mfc1 $a0, $f10 -/* 00804 80894CA4 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 00808 80894CA8 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 0080C 80894CAC 460A4281 */ sub.s $f10, $f8, $f10 -/* 00810 80894CB0 44C4F800 */ ctc1 $a0, $31 -/* 00814 80894CB4 00000000 */ nop -/* 00818 80894CB8 460052A4 */ cvt.w.s $f10, $f10 -/* 0081C 80894CBC 4444F800 */ cfc1 $a0, $31 -/* 00820 80894CC0 00000000 */ nop -/* 00824 80894CC4 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 00828 80894CC8 14800005 */ bne $a0, $zero, .L80894CE0 -/* 0082C 80894CCC 00000000 */ nop -/* 00830 80894CD0 44045000 */ mfc1 $a0, $f10 -/* 00834 80894CD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00838 80894CD8 10000007 */ beq $zero, $zero, .L80894CF8 -/* 0083C 80894CDC 00812025 */ or $a0, $a0, $at ## $a0 = 80000000 -.L80894CE0: -/* 00840 80894CE0 10000005 */ beq $zero, $zero, .L80894CF8 -/* 00844 80894CE4 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 00848 80894CE8 44045000 */ mfc1 $a0, $f10 -.L80894CEC: -/* 0084C 80894CEC 00000000 */ nop -/* 00850 80894CF0 0480FFFB */ bltz $a0, .L80894CE0 -/* 00854 80894CF4 00000000 */ nop -.L80894CF8: -/* 00858 80894CF8 44CCF800 */ ctc1 $t4, $31 -/* 0085C 80894CFC 2C81009A */ sltiu $at, $a0, 0x009A -/* 00860 80894D00 14200003 */ bne $at, $zero, .L80894D10 -/* 00864 80894D04 00801025 */ or $v0, $a0, $zero ## $v0 = FFFFFFFF -/* 00868 80894D08 10000001 */ beq $zero, $zero, .L80894D10 -/* 0086C 80894D0C 24020099 */ addiu $v0, $zero, 0x0099 ## $v0 = 00000099 -.L80894D10: -/* 00870 80894D10 304D00FF */ andi $t5, $v0, 0x00FF ## $t5 = 00000099 -/* 00874 80894D14 01A77025 */ or $t6, $t5, $a3 ## $t6 = FFFFFF99 -/* 00878 80894D18 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 0087C 80894D1C 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 00880 80894D20 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 00884 80894D24 2718DC40 */ addiu $t8, $t8, 0xDC40 ## $t8 = 0600DC40 -/* 00888 80894D28 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 000000A1 -/* 0088C 80894D2C AD0F02D0 */ sw $t7, 0x02D0($t0) ## 000002D0 -/* 00890 80894D30 AC580004 */ sw $t8, 0x0004($v0) ## 0000009D -/* 00894 80894D34 AC490000 */ sw $t1, 0x0000($v0) ## 00000099 -/* 00898 80894D38 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 0089C 80894D3C 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 008A0 80894D40 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 008A4 80894D44 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 000000A1 -/* 008A8 80894D48 AD1902D0 */ sw $t9, 0x02D0($t0) ## 000002D0 -/* 008AC 80894D4C AC400004 */ sw $zero, 0x0004($v0) ## 0000009D -/* 008B0 80894D50 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000099 -/* 008B4 80894D54 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 -/* 008B8 80894D58 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 -/* 008BC 80894D5C 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 008C0 80894D60 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 008C4 80894D64 AD0B02D0 */ sw $t3, 0x02D0($t0) ## 000002D0 -/* 008C8 80894D68 AC660000 */ sw $a2, 0x0000($v1) ## 00000000 -/* 008CC 80894D6C C4B001B0 */ lwc1 $f16, 0x01B0($a1) ## 000001B0 -/* 008D0 80894D70 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 008D4 80894D74 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 008D8 80894D78 46128102 */ mul.s $f4, $f16, $f18 -/* 008DC 80894D7C 2718DB60 */ addiu $t8, $t8, 0xDB60 ## $t8 = 0600DB60 -/* 008E0 80894D80 3C068089 */ lui $a2, %hi(D_80895080) ## $a2 = 80890000 -/* 008E4 80894D84 444CF800 */ cfc1 $t4, $31 -/* 008E8 80894D88 44C4F800 */ ctc1 $a0, $31 -/* 008EC 80894D8C 00000000 */ nop -/* 008F0 80894D90 460021A4 */ cvt.w.s $f6, $f4 -/* 008F4 80894D94 4444F800 */ cfc1 $a0, $31 -/* 008F8 80894D98 00000000 */ nop -/* 008FC 80894D9C 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 00900 80894DA0 50800013 */ beql $a0, $zero, .L80894DF0 -/* 00904 80894DA4 44043000 */ mfc1 $a0, $f6 -/* 00908 80894DA8 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 0090C 80894DAC 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00910 80894DB0 46062181 */ sub.s $f6, $f4, $f6 -/* 00914 80894DB4 44C4F800 */ ctc1 $a0, $31 -/* 00918 80894DB8 00000000 */ nop -/* 0091C 80894DBC 460031A4 */ cvt.w.s $f6, $f6 -/* 00920 80894DC0 4444F800 */ cfc1 $a0, $31 -/* 00924 80894DC4 00000000 */ nop -/* 00928 80894DC8 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 0092C 80894DCC 14800005 */ bne $a0, $zero, .L80894DE4 -/* 00930 80894DD0 00000000 */ nop -/* 00934 80894DD4 44043000 */ mfc1 $a0, $f6 -/* 00938 80894DD8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0093C 80894DDC 10000007 */ beq $zero, $zero, .L80894DFC -/* 00940 80894DE0 00812025 */ or $a0, $a0, $at ## $a0 = 80000000 -.L80894DE4: -/* 00944 80894DE4 10000005 */ beq $zero, $zero, .L80894DFC -/* 00948 80894DE8 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 0094C 80894DEC 44043000 */ mfc1 $a0, $f6 -.L80894DF0: -/* 00950 80894DF0 00000000 */ nop -/* 00954 80894DF4 0480FFFB */ bltz $a0, .L80894DE4 -/* 00958 80894DF8 00000000 */ nop -.L80894DFC: -/* 0095C 80894DFC 44CCF800 */ ctc1 $t4, $31 -/* 00960 80894E00 2C810100 */ sltiu $at, $a0, 0x0100 -/* 00964 80894E04 14200003 */ bne $at, $zero, .L80894E14 -/* 00968 80894E08 00801025 */ or $v0, $a0, $zero ## $v0 = FFFFFFFF -/* 0096C 80894E0C 10000001 */ beq $zero, $zero, .L80894E14 -/* 00970 80894E10 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L80894E14: -/* 00974 80894E14 304D00FF */ andi $t5, $v0, 0x00FF ## $t5 = 000000FF -/* 00978 80894E18 01A77025 */ or $t6, $t5, $a3 ## $t6 = FFFFFFFF -/* 0097C 80894E1C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 00980 80894E20 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 00984 80894E24 240701D8 */ addiu $a3, $zero, 0x01D8 ## $a3 = 000001D8 -/* 00988 80894E28 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 0098C 80894E2C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000107 -/* 00990 80894E30 AD0F02D0 */ sw $t7, 0x02D0($t0) ## 000002D0 -/* 00994 80894E34 AC580004 */ sw $t8, 0x0004($v0) ## 00000103 -/* 00998 80894E38 AC490000 */ sw $t1, 0x0000($v0) ## 000000FF -/* 0099C 80894E3C 8FB9005C */ lw $t9, 0x005C($sp) -/* 009A0 80894E40 24C65080 */ addiu $a2, $a2, %lo(D_80895080) ## $a2 = 80895080 -/* 009A4 80894E44 0C031AD5 */ jal Graph_CloseDisps -/* 009A8 80894E48 8F250000 */ lw $a1, 0x0000($t9) ## 000000A1 -/* 009AC 80894E4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009B0 80894E50 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 009B4 80894E54 03E00008 */ jr $ra -/* 009B8 80894E58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s deleted file mode 100644 index 258726d752..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel BgSpot11Oasis_Init -/* 00130 808B2920 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00134 808B2924 AFA5001C */ sw $a1, 0x001C($sp) -/* 00138 808B2928 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0013C 808B292C 3C05808B */ lui $a1, %hi(D_808B2E24) ## $a1 = 808B0000 -/* 00140 808B2930 AFA40018 */ sw $a0, 0x0018($sp) -/* 00144 808B2934 0C01E037 */ jal Actor_ProcessInitChain - -/* 00148 808B2938 24A52E24 */ addiu $a1, $a1, %lo(D_808B2E24) ## $a1 = 808B2E24 -/* 0014C 808B293C 0C22CA5C */ jal func_808B2970 -/* 00150 808B2940 8FA40018 */ lw $a0, 0x0018($sp) -/* 00154 808B2944 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 00158 808B2948 44812000 */ mtc1 $at, $f4 ## $f4 = -100.00 -/* 0015C 808B294C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00160 808B2950 2405FF9C */ addiu $a1, $zero, 0xFF9C ## $a1 = FFFFFF9C -/* 00164 808B2954 E5C40028 */ swc1 $f4, 0x0028($t6) ## 00000028 -/* 00168 808B2958 0C22C9FC */ jal func_808B27F0 -/* 0016C 808B295C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00170 808B2960 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00174 808B2964 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00178 808B2968 03E00008 */ jr $ra -/* 0017C 808B296C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s deleted file mode 100644 index 06af19f0cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s +++ /dev/null @@ -1,148 +0,0 @@ -.late_rodata -glabel D_808B2EB8 - .float 0.12 - -glabel D_808B2EBC - .float 0.02 - -glabel D_808B2EC0 - .float 0.3 - -glabel D_808B2EC4 - .word 0x409CCCCD, 0x00000000, 0x00000000 - -.text -glabel BgSpot11Oasis_Update -/* 002D4 808B2AC4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 002D8 808B2AC8 AFB00020 */ sw $s0, 0x0020($sp) -/* 002DC 808B2ACC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002E0 808B2AD0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002E4 808B2AD4 AFA5004C */ sw $a1, 0x004C($sp) -/* 002E8 808B2AD8 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 002EC 808B2ADC 0320F809 */ jalr $ra, $t9 -/* 002F0 808B2AE0 00000000 */ nop -/* 002F4 808B2AE4 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C -/* 002F8 808B2AE8 3C0E808B */ lui $t6, %hi(func_808B2980) ## $t6 = 808B0000 -/* 002FC 808B2AEC 25CE2980 */ addiu $t6, $t6, %lo(func_808B2980) ## $t6 = 808B2980 -/* 00300 808B2AF0 55CF0004 */ bnel $t6, $t7, .L808B2B04 -/* 00304 808B2AF4 92080150 */ lbu $t0, 0x0150($s0) ## 00000150 -/* 00308 808B2AF8 10000066 */ beq $zero, $zero, .L808B2C94 -/* 0030C 808B2AFC AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 00310 808B2B00 92080150 */ lbu $t0, 0x0150($s0) ## 00000150 -.L808B2B04: -/* 00314 808B2B04 3C18808B */ lui $t8, %hi(func_808B2CA8) ## $t8 = 808B0000 -/* 00318 808B2B08 27182CA8 */ addiu $t8, $t8, %lo(func_808B2CA8) ## $t8 = 808B2CA8 -/* 0031C 808B2B0C 1100005F */ beq $t0, $zero, .L808B2C8C -/* 00320 808B2B10 AE180134 */ sw $t8, 0x0134($s0) ## 00000134 -/* 00324 808B2B14 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00328 808B2B18 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 0032C 808B2B1C C60000EC */ lwc1 $f0, 0x00EC($s0) ## 000000EC -/* 00330 808B2B20 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 00334 808B2B24 4604003C */ c.lt.s $f0, $f4 -/* 00338 808B2B28 00000000 */ nop -/* 0033C 808B2B2C 45020058 */ bc1fl .L808B2C90 -/* 00340 808B2B30 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00344 808B2B34 44813000 */ mtc1 $at, $f6 ## $f6 = -40.00 -/* 00348 808B2B38 8FA9004C */ lw $t1, 0x004C($sp) -/* 0034C 808B2B3C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00350 808B2B40 4600303C */ c.lt.s $f6, $f0 -/* 00354 808B2B44 00491021 */ addu $v0, $v0, $t1 -/* 00358 808B2B48 45020051 */ bc1fl .L808B2C90 -/* 0035C 808B2B4C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00360 808B2B50 8C421DE4 */ lw $v0, 0x1DE4($v0) ## 00011DE4 -/* 00364 808B2B54 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00368 808B2B58 3C0D808B */ lui $t5, %hi(D_808B2E34) ## $t5 = 808B0000 -/* 0036C 808B2B5C 304A0004 */ andi $t2, $v0, 0x0004 ## $t2 = 00000000 -/* 00370 808B2B60 5140004D */ beql $t2, $zero, .L808B2C98 -/* 00374 808B2B64 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00378 808B2B68 920B0151 */ lbu $t3, 0x0151($s0) ## 00000151 -/* 0037C 808B2B6C 25AD2E34 */ addiu $t5, $t5, %lo(D_808B2E34) ## $t5 = 808B2E34 -/* 00380 808B2B70 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFE8 -/* 00384 808B2B74 000B6080 */ sll $t4, $t3, 2 -/* 00388 808B2B78 018B6023 */ subu $t4, $t4, $t3 -/* 0038C 808B2B7C 000C6080 */ sll $t4, $t4, 2 -/* 00390 808B2B80 0C01DFA7 */ jal Math_Vec3f_Sum - ## Vec3f_Add -/* 00394 808B2B84 018D2821 */ addu $a1, $t4, $t5 -/* 00398 808B2B88 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0039C 808B2B8C 00000000 */ nop -/* 003A0 808B2B90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 003A4 808B2B94 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 003A8 808B2B98 3C01808B */ lui $at, %hi(D_808B2EB8) ## $at = 808B0000 -/* 003AC 808B2B9C C42A2EB8 */ lwc1 $f10, %lo(D_808B2EB8)($at) -/* 003B0 808B2BA0 3C01808B */ lui $at, %hi(D_808B2EBC) ## $at = 808B0000 -/* 003B4 808B2BA4 C4322EBC */ lwc1 $f18, %lo(D_808B2EBC)($at) -/* 003B8 808B2BA8 460A0402 */ mul.s $f16, $f0, $f10 -/* 003BC 808B2BAC 8FA4004C */ lw $a0, 0x004C($sp) -/* 003C0 808B2BB0 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFE8 -/* 003C4 808B2BB4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 003C8 808B2BB8 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 003CC 808B2BBC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 003D0 808B2BC0 46128100 */ add.s $f4, $f16, $f18 -/* 003D4 808B2BC4 0C00A4F9 */ jal EffectSsBubble_Spawn -/* 003D8 808B2BC8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 003DC 808B2BCC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 003E0 808B2BD0 00000000 */ nop -/* 003E4 808B2BD4 3C01808B */ lui $at, %hi(D_808B2EC0) ## $at = 808B0000 -/* 003E8 808B2BD8 C4262EC0 */ lwc1 $f6, %lo(D_808B2EC0)($at) -/* 003EC 808B2BDC 4606003C */ c.lt.s $f0, $f6 -/* 003F0 808B2BE0 00000000 */ nop -/* 003F4 808B2BE4 4502002C */ bc1fl .L808B2C98 -/* 003F8 808B2BE8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003FC 808B2BEC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00400 808B2BF0 00000000 */ nop -/* 00404 808B2BF4 3C01808B */ lui $at, %hi(D_808B2EC4) ## $at = 808B0000 -/* 00408 808B2BF8 C4282EC4 */ lwc1 $f8, %lo(D_808B2EC4)($at) -/* 0040C 808B2BFC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00410 808B2C00 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00414 808B2C04 46080282 */ mul.s $f10, $f0, $f8 -/* 00418 808B2C08 4459F800 */ cfc1 $t9, $31 -/* 0041C 808B2C0C 44CEF800 */ ctc1 $t6, $31 -/* 00420 808B2C10 00000000 */ nop -/* 00424 808B2C14 46005424 */ cvt.w.s $f16, $f10 -/* 00428 808B2C18 444EF800 */ cfc1 $t6, $31 -/* 0042C 808B2C1C 00000000 */ nop -/* 00430 808B2C20 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 00434 808B2C24 51C00013 */ beql $t6, $zero, .L808B2C74 -/* 00438 808B2C28 440E8000 */ mfc1 $t6, $f16 -/* 0043C 808B2C2C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 00440 808B2C30 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00444 808B2C34 46105401 */ sub.s $f16, $f10, $f16 -/* 00448 808B2C38 44CEF800 */ ctc1 $t6, $31 -/* 0044C 808B2C3C 00000000 */ nop -/* 00450 808B2C40 46008424 */ cvt.w.s $f16, $f16 -/* 00454 808B2C44 444EF800 */ cfc1 $t6, $31 -/* 00458 808B2C48 00000000 */ nop -/* 0045C 808B2C4C 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 00460 808B2C50 15C00005 */ bne $t6, $zero, .L808B2C68 -/* 00464 808B2C54 00000000 */ nop -/* 00468 808B2C58 440E8000 */ mfc1 $t6, $f16 -/* 0046C 808B2C5C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00470 808B2C60 10000007 */ beq $zero, $zero, .L808B2C80 -/* 00474 808B2C64 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 -.L808B2C68: -/* 00478 808B2C68 10000005 */ beq $zero, $zero, .L808B2C80 -/* 0047C 808B2C6C 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 00480 808B2C70 440E8000 */ mfc1 $t6, $f16 -.L808B2C74: -/* 00484 808B2C74 00000000 */ nop -/* 00488 808B2C78 05C0FFFB */ bltz $t6, .L808B2C68 -/* 0048C 808B2C7C 00000000 */ nop -.L808B2C80: -/* 00490 808B2C80 44D9F800 */ ctc1 $t9, $31 -/* 00494 808B2C84 10000003 */ beq $zero, $zero, .L808B2C94 -/* 00498 808B2C88 A20E0151 */ sb $t6, 0x0151($s0) ## 00000151 -.L808B2C8C: -/* 0049C 808B2C8C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -.L808B2C90: -/* 004A0 808B2C90 A20F0150 */ sb $t7, 0x0150($s0) ## 00000150 -.L808B2C94: -/* 004A4 808B2C94 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B2C98: -/* 004A8 808B2C98 8FB00020 */ lw $s0, 0x0020($sp) -/* 004AC 808B2C9C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 004B0 808B2CA0 03E00008 */ jr $ra -/* 004B4 808B2CA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s deleted file mode 100644 index 02327b1c03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808B27F0 -/* 00000 808B27F0 AFA50004 */ sw $a1, 0x0004($sp) -/* 00004 808B27F4 8C8E07C0 */ lw $t6, 0x07C0($a0) ## 000007C0 -/* 00008 808B27F8 00052C00 */ sll $a1, $a1, 16 -/* 0000C 808B27FC 00052C03 */ sra $a1, $a1, 16 -/* 00010 808B2800 8DC20028 */ lw $v0, 0x0028($t6) ## 00000028 -/* 00014 808B2804 03E00008 */ jr $ra -/* 00018 808B2808 A4450002 */ sh $a1, 0x0002($v0) ## 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s deleted file mode 100644 index 1c8517e288..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_808B280C -/* 0001C 808B280C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00020 808B2810 3C03808B */ lui $v1, %hi(D_808B2E10) ## $v1 = 808B0000 -/* 00024 808B2814 24632E10 */ addiu $v1, $v1, %lo(D_808B2E10) ## $v1 = 808B2E10 -/* 00028 808B2818 846E0000 */ lh $t6, 0x0000($v1) ## 808B2E10 -/* 0002C 808B281C 846F0002 */ lh $t7, 0x0002($v1) ## 808B2E12 -/* 00030 808B2820 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00034 808B2824 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00038 808B2828 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0003C 808B282C AFB50030 */ sw $s5, 0x0030($sp) -/* 00040 808B2830 468021A0 */ cvt.s.w $f6, $f4 -/* 00044 808B2834 AFB4002C */ sw $s4, 0x002C($sp) -/* 00048 808B2838 AFB30028 */ sw $s3, 0x0028($sp) -/* 0004C 808B283C AFB20024 */ sw $s2, 0x0024($sp) -/* 00050 808B2840 AFB10020 */ sw $s1, 0x0020($sp) -/* 00054 808B2844 468042A0 */ cvt.s.w $f10, $f8 -/* 00058 808B2848 AFB0001C */ sw $s0, 0x001C($sp) -/* 0005C 808B284C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00060 808B2850 8C911C44 */ lw $s1, 0x1C44($a0) ## 00001C44 -/* 00064 808B2854 3C10808B */ lui $s0, %hi(D_808B2E14) ## $s0 = 808B0000 -/* 00068 808B2858 3C15808B */ lui $s5, %hi(D_808B2E20) ## $s5 = 808B0000 -/* 0006C 808B285C E7A60058 */ swc1 $f6, 0x0058($sp) -/* 00070 808B2860 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 00074 808B2864 26B52E20 */ addiu $s5, $s5, %lo(D_808B2E20) ## $s5 = 808B2E20 -/* 00078 808B2868 26102E14 */ addiu $s0, $s0, %lo(D_808B2E14) ## $s0 = 808B2E14 -/* 0007C 808B286C 27B20058 */ addiu $s2, $sp, 0x0058 ## $s2 = FFFFFFF0 -/* 00080 808B2870 27B3004C */ addiu $s3, $sp, 0x004C ## $s3 = FFFFFFE4 -/* 00084 808B2874 27B40040 */ addiu $s4, $sp, 0x0040 ## $s4 = FFFFFFD8 -/* 00088 808B2878 E7A0005C */ swc1 $f0, 0x005C($sp) -/* 0008C 808B287C E7A00050 */ swc1 $f0, 0x0050($sp) -/* 00090 808B2880 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 00094 808B2884 86180000 */ lh $t8, 0x0000($s0) ## 808B2E14 -.L808B2888: -/* 00098 808B2888 86190002 */ lh $t9, 0x0002($s0) ## 808B2E16 -/* 0009C 808B288C 86080004 */ lh $t0, 0x0004($s0) ## 808B2E18 -/* 000A0 808B2890 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 000A4 808B2894 86090006 */ lh $t1, 0x0006($s0) ## 808B2E1A -/* 000A8 808B2898 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 000AC 808B289C 468084A0 */ cvt.s.w $f18, $f16 -/* 000B0 808B28A0 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 000B4 808B28A4 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 000B8 808B28A8 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFF0 -/* 000BC 808B28AC 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE4 -/* 000C0 808B28B0 468021A0 */ cvt.s.w $f6, $f4 -/* 000C4 808B28B4 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 000C8 808B28B8 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFD8 -/* 000CC 808B28BC 468042A0 */ cvt.s.w $f10, $f8 -/* 000D0 808B28C0 E7A60054 */ swc1 $f6, 0x0054($sp) -/* 000D4 808B28C4 468084A0 */ cvt.s.w $f18, $f16 -/* 000D8 808B28C8 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 000DC 808B28CC E7B20048 */ swc1 $f18, 0x0048($sp) -/* 000E0 808B28D0 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 000E4 808B28D4 8E27002C */ lw $a3, 0x002C($s1) ## 0000002C -/* 000E8 808B28D8 0C0333D2 */ jal Math3D_TriChkPointParaYSlopedY -/* 000EC 808B28DC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 000F0 808B28E0 10400003 */ beq $v0, $zero, .L808B28F0 -/* 000F4 808B28E4 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 808B2E18 -/* 000F8 808B28E8 10000004 */ beq $zero, $zero, .L808B28FC -/* 000FC 808B28EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B28F0: -/* 00100 808B28F0 5615FFE5 */ bnel $s0, $s5, .L808B2888 -/* 00104 808B28F4 86180000 */ lh $t8, 0x0000($s0) ## 808B2E18 -/* 00108 808B28F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B28FC: -/* 0010C 808B28FC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00110 808B2900 8FB0001C */ lw $s0, 0x001C($sp) -/* 00114 808B2904 8FB10020 */ lw $s1, 0x0020($sp) -/* 00118 808B2908 8FB20024 */ lw $s2, 0x0024($sp) -/* 0011C 808B290C 8FB30028 */ lw $s3, 0x0028($sp) -/* 00120 808B2910 8FB4002C */ lw $s4, 0x002C($sp) -/* 00124 808B2914 8FB50030 */ lw $s5, 0x0030($sp) -/* 00128 808B2918 03E00008 */ jr $ra -/* 0012C 808B291C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s deleted file mode 100644 index 90cbb18662..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808B2970 -/* 00180 808B2970 3C0E808B */ lui $t6, %hi(func_808B2980) ## $t6 = 808B0000 -/* 00184 808B2974 25CE2980 */ addiu $t6, $t6, %lo(func_808B2980) ## $t6 = 808B2980 -/* 00188 808B2978 03E00008 */ jr $ra -/* 0018C 808B297C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s deleted file mode 100644 index 4c58cdac21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_808B2980 -/* 00190 808B2980 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00194 808B2984 AFA40020 */ sw $a0, 0x0020($sp) -/* 00198 808B2988 AFBF001C */ sw $ra, 0x001C($sp) -/* 0019C 808B298C AFA50024 */ sw $a1, 0x0024($sp) -/* 001A0 808B2990 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001A4 808B2994 0C01B129 */ jal Flags_GetEnv -/* 001A8 808B2998 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 001AC 808B299C 5040000D */ beql $v0, $zero, .L808B29D4 -/* 001B0 808B29A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 001B4 808B29A4 0C22CA03 */ jal func_808B280C -/* 001B8 808B29A8 8FA40024 */ lw $a0, 0x0024($sp) -/* 001BC 808B29AC 10400008 */ beq $v0, $zero, .L808B29D0 -/* 001C0 808B29B0 8FA40024 */ lw $a0, 0x0024($sp) -/* 001C4 808B29B4 24051036 */ addiu $a1, $zero, 0x1036 ## $a1 = 00001036 -/* 001C8 808B29B8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 001CC 808B29BC 8FA70020 */ lw $a3, 0x0020($sp) -/* 001D0 808B29C0 0C02003E */ jal func_800800F8 -/* 001D4 808B29C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 001D8 808B29C8 0C22CA78 */ jal func_808B29E0 -/* 001DC 808B29CC 8FA40020 */ lw $a0, 0x0020($sp) -.L808B29D0: -/* 001E0 808B29D0 8FBF001C */ lw $ra, 0x001C($sp) -.L808B29D4: -/* 001E4 808B29D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001E8 808B29D8 03E00008 */ jr $ra -/* 001EC 808B29DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s deleted file mode 100644 index ac4040360b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808B29E0 -/* 001F0 808B29E0 3C0E808B */ lui $t6, %hi(func_808B29F0) ## $t6 = 808B0000 -/* 001F4 808B29E4 25CE29F0 */ addiu $t6, $t6, %lo(func_808B29F0) ## $t6 = 808B29F0 -/* 001F8 808B29E8 03E00008 */ jr $ra -/* 001FC 808B29EC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s deleted file mode 100644 index 671cd2ce9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_808B29F0 -/* 00200 808B29F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00204 808B29F4 AFB00030 */ sw $s0, 0x0030($sp) -/* 00208 808B29F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0020C 808B29FC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00210 808B2A00 AFA5003C */ sw $a1, 0x003C($sp) -/* 00214 808B2A04 3C063F33 */ lui $a2, 0x3F33 ## $a2 = 3F330000 -/* 00218 808B2A08 34C63333 */ ori $a2, $a2, 0x3333 ## $a2 = 3F333333 -/* 0021C 808B2A0C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00220 808B2A10 0C01DE80 */ jal Math_ApproxF - -/* 00224 808B2A14 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 00228 808B2A18 50400017 */ beql $v0, $zero, .L808B2A78 -/* 0022C 808B2A1C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00230 808B2A20 0C22CAAA */ jal func_808B2AA8 -/* 00234 808B2A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00238 808B2A28 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0023C 808B2A2C 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 00240 808B2A30 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00244 808B2A34 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00248 808B2A38 8FA5003C */ lw $a1, 0x003C($sp) -/* 0024C 808B2A3C 46062200 */ add.s $f8, $f4, $f6 -/* 00250 808B2A40 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00254 808B2A44 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 00258 808B2A48 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 0025C 808B2A4C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00260 808B2A50 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00264 808B2A54 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00268 808B2A58 AFA00020 */ sw $zero, 0x0020($sp) -/* 0026C 808B2A5C AFA0001C */ sw $zero, 0x001C($sp) -/* 00270 808B2A60 AFA00018 */ sw $zero, 0x0018($sp) -/* 00274 808B2A64 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00278 808B2A68 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 0027C 808B2A6C 0C01E221 */ jal func_80078884 -/* 00280 808B2A70 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00284 808B2A74 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -.L808B2A78: -/* 00288 808B2A78 8FA4003C */ lw $a0, 0x003C($sp) -/* 0028C 808B2A7C 4600848D */ trunc.w.s $f18, $f16 -/* 00290 808B2A80 44059000 */ mfc1 $a1, $f18 -/* 00294 808B2A84 00000000 */ nop -/* 00298 808B2A88 00052C00 */ sll $a1, $a1, 16 -/* 0029C 808B2A8C 0C22C9FC */ jal func_808B27F0 -/* 002A0 808B2A90 00052C03 */ sra $a1, $a1, 16 -/* 002A4 808B2A94 8FBF0034 */ lw $ra, 0x0034($sp) -/* 002A8 808B2A98 8FB00030 */ lw $s0, 0x0030($sp) -/* 002AC 808B2A9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 002B0 808B2AA0 03E00008 */ jr $ra -/* 002B4 808B2AA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s deleted file mode 100644 index 93dbd5c829..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808B2AA8 -/* 002B8 808B2AA8 3C0E808B */ lui $t6, %hi(func_808B2AB8) ## $t6 = 808B0000 -/* 002BC 808B2AAC 25CE2AB8 */ addiu $t6, $t6, %lo(func_808B2AB8) ## $t6 = 808B2AB8 -/* 002C0 808B2AB0 03E00008 */ jr $ra -/* 002C4 808B2AB4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s deleted file mode 100644 index f5744f0e81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_808B2AB8 -/* 002C8 808B2AB8 AFA40000 */ sw $a0, 0x0000($sp) -/* 002CC 808B2ABC 03E00008 */ jr $ra -/* 002D0 808B2AC0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s deleted file mode 100644 index 824c34fc38..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s +++ /dev/null @@ -1,97 +0,0 @@ -.rdata -glabel D_808B2E70 - .asciz "../z_bg_spot11_oasis.c" - .balign 4 - -glabel D_808B2E88 - .asciz "../z_bg_spot11_oasis.c" - .balign 4 - -glabel D_808B2EA0 - .asciz "../z_bg_spot11_oasis.c" - .balign 4 - -.text -glabel func_808B2CA8 -/* 004B8 808B2CA8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 004BC 808B2CAC 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 004C0 808B2CB0 AFBF003C */ sw $ra, 0x003C($sp) -/* 004C4 808B2CB4 AFB10038 */ sw $s1, 0x0038($sp) -/* 004C8 808B2CB8 AFB00034 */ sw $s0, 0x0034($sp) -/* 004CC 808B2CBC AFA40070 */ sw $a0, 0x0070($sp) -/* 004D0 808B2CC0 01C57021 */ addu $t6, $t6, $a1 -/* 004D4 808B2CC4 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 004D8 808B2CC8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 004DC 808B2CCC 3C06808B */ lui $a2, %hi(D_808B2E70) ## $a2 = 808B0000 -/* 004E0 808B2CD0 AFAE006C */ sw $t6, 0x006C($sp) -/* 004E4 808B2CD4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 004E8 808B2CD8 24C62E70 */ addiu $a2, $a2, %lo(D_808B2E70) ## $a2 = 808B2E70 -/* 004EC 808B2CDC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 004F0 808B2CE0 24070147 */ addiu $a3, $zero, 0x0147 ## $a3 = 00000147 -/* 004F4 808B2CE4 0C031AB1 */ jal Graph_OpenDisps -/* 004F8 808B2CE8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 004FC 808B2CEC 0C024F61 */ jal func_80093D84 -/* 00500 808B2CF0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00504 808B2CF4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00508 808B2CF8 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 0050C 808B2CFC 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 00510 808B2D00 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00514 808B2D04 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00518 808B2D08 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0051C 808B2D0C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00520 808B2D10 3C05808B */ lui $a1, %hi(D_808B2E88) ## $a1 = 808B0000 -/* 00524 808B2D14 24A52E88 */ addiu $a1, $a1, %lo(D_808B2E88) ## $a1 = 808B2E88 -/* 00528 808B2D18 2406014B */ addiu $a2, $zero, 0x014B ## $a2 = 0000014B -/* 0052C 808B2D1C 0C0346A2 */ jal Matrix_NewMtx -/* 00530 808B2D20 AFA20054 */ sw $v0, 0x0054($sp) -/* 00534 808B2D24 8FA30054 */ lw $v1, 0x0054($sp) -/* 00538 808B2D28 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0053C 808B2D2C 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 00540 808B2D30 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00544 808B2D34 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00548 808B2D38 8FA9006C */ lw $t1, 0x006C($sp) -/* 0054C 808B2D3C 240B007F */ addiu $t3, $zero, 0x007F ## $t3 = 0000007F -/* 00550 808B2D40 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00554 808B2D44 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00558 808B2D48 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0055C 808B2D4C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00560 808B2D50 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 00564 808B2D54 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 00568 808B2D58 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0056C 808B2D5C 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 00570 808B2D60 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00574 808B2D64 3123007F */ andi $v1, $t1, 0x007F ## $v1 = 00000000 -/* 00578 808B2D68 3127007F */ andi $a3, $t1, 0x007F ## $a3 = 00000000 -/* 0057C 808B2D6C AFA70020 */ sw $a3, 0x0020($sp) -/* 00580 808B2D70 01633023 */ subu $a2, $t3, $v1 -/* 00584 808B2D74 AFA3001C */ sw $v1, 0x001C($sp) -/* 00588 808B2D78 AFB80028 */ sw $t8, 0x0028($sp) -/* 0058C 808B2D7C AFAF0024 */ sw $t7, 0x0024($sp) -/* 00590 808B2D80 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00594 808B2D84 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00598 808B2D88 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0059C 808B2D8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005A0 808B2D90 0C0253D0 */ jal Gfx_TwoTexScroll -/* 005A4 808B2D94 AFA20050 */ sw $v0, 0x0050($sp) -/* 005A8 808B2D98 8FA80050 */ lw $t0, 0x0050($sp) -/* 005AC 808B2D9C 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 005B0 808B2DA0 256B0870 */ addiu $t3, $t3, 0x0870 ## $t3 = 06000870 -/* 005B4 808B2DA4 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 005B8 808B2DA8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 005BC 808B2DAC 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 005C0 808B2DB0 3C06808B */ lui $a2, %hi(D_808B2EA0) ## $a2 = 808B0000 -/* 005C4 808B2DB4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 005C8 808B2DB8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 005CC 808B2DBC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 005D0 808B2DC0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 005D4 808B2DC4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 005D8 808B2DC8 24C62EA0 */ addiu $a2, $a2, %lo(D_808B2EA0) ## $a2 = 808B2EA0 -/* 005DC 808B2DCC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 005E0 808B2DD0 0C031AD5 */ jal Graph_CloseDisps -/* 005E4 808B2DD4 2407015A */ addiu $a3, $zero, 0x015A ## $a3 = 0000015A -/* 005E8 808B2DD8 8FBF003C */ lw $ra, 0x003C($sp) -/* 005EC 808B2DDC 8FB00034 */ lw $s0, 0x0034($sp) -/* 005F0 808B2DE0 8FB10038 */ lw $s1, 0x0038($sp) -/* 005F4 808B2DE4 03E00008 */ jr $ra -/* 005F8 808B2DE8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 005FC 808B2DEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s deleted file mode 100644 index b646130db8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel EnElf_Destroy -/* 00DA0 80A029D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DA4 80A029D4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DA8 80A029D8 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00DAC 80A029DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DB0 80A029E0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00DB4 80A029E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00DB8 80A029E8 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 00DBC 80A029EC 8DC60274 */ lw $a2, 0x0274($t6) ## 00000274 -/* 00DC0 80A029F0 AFA7002C */ sw $a3, 0x002C($sp) -/* 00DC4 80A029F4 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00DC8 80A029F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00DCC 80A029FC 8FAF0028 */ lw $t7, 0x0028($sp) -/* 00DD0 80A02A00 8FA5001C */ lw $a1, 0x001C($sp) -/* 00DD4 80A02A04 8FA4002C */ lw $a0, 0x002C($sp) -/* 00DD8 80A02A08 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00DDC 80A02A0C 8DE60288 */ lw $a2, 0x0288($t7) ## 00000288 -/* 00DE0 80A02A10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DE4 80A02A14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DE8 80A02A18 03E00008 */ jr $ra -/* 00DEC 80A02A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s deleted file mode 100644 index c2c1bd6c88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s +++ /dev/null @@ -1,478 +0,0 @@ -.rdata -glabel D_80A06124 - .asciz "../z_en_elf.c" - .balign 4 - -glabel D_80A06134 - .asciz "../z_en_elf.c" - .balign 4 - -.late_rodata -glabel D_80A0623C - .float 0.0011666666250675917 - -.text -glabel EnElf_Draw -/* 03C28 80A05858 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 03C2C 80A0585C AFBF002C */ sw $ra, 0x002C($sp) -/* 03C30 80A05860 AFB00028 */ sw $s0, 0x0028($sp) -/* 03C34 80A05864 848E02A8 */ lh $t6, 0x02A8($a0) ## 000002A8 -/* 03C38 80A05868 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03C3C 80A0586C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03C40 80A05870 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 03C44 80A05874 11C101A1 */ beq $t6, $at, .L80A05EFC -/* 03C48 80A05878 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 03C4C 80A0587C 948F02C4 */ lhu $t7, 0x02C4($a0) ## 000002C4 -/* 03C50 80A05880 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 03C54 80A05884 5700019E */ bnel $t8, $zero, .L80A05F00 -/* 03C58 80A05888 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C5C 80A0588C 8C59067C */ lw $t9, 0x067C($v0) ## 0000067C -/* 03C60 80A05890 3C0B8016 */ lui $t3, %hi(gGameInfo) -/* 03C64 80A05894 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 03C68 80A05898 001952C0 */ sll $t2, $t9, 11 -/* 03C6C 80A0589C 0543000C */ bgezl $t2, .L80A058D0 -/* 03C70 80A058A0 8CC40000 */ lw $a0, 0x0000($a2) ## 00000000 -/* 03C74 80A058A4 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) -/* 03C78 80A058A8 C48800EC */ lwc1 $f8, 0x00EC($a0) ## 000000EC -/* 03C7C 80A058AC 856C1508 */ lh $t4, 0x1508($t3) ## 80161508 -/* 03C80 80A058B0 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 03C84 80A058B4 00000000 */ nop -/* 03C88 80A058B8 468021A0 */ cvt.s.w $f6, $f4 -/* 03C8C 80A058BC 4608303C */ c.lt.s $f6, $f8 -/* 03C90 80A058C0 00000000 */ nop -/* 03C94 80A058C4 4502018E */ bc1fl .L80A05F00 -/* 03C98 80A058C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C9C 80A058CC 8CC40000 */ lw $a0, 0x0000($a2) ## 00000000 -.L80A058D0: -/* 03CA0 80A058D0 0C031A73 */ jal Graph_Alloc - -/* 03CA4 80A058D4 AFA60084 */ sw $a2, 0x0084($sp) -/* 03CA8 80A058D8 8FAD0084 */ lw $t5, 0x0084($sp) -/* 03CAC 80A058DC 3C0680A0 */ lui $a2, %hi(D_80A06124) ## $a2 = 80A00000 -/* 03CB0 80A058E0 24C66124 */ addiu $a2, $a2, %lo(D_80A06124) ## $a2 = 80A06124 -/* 03CB4 80A058E4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 03CB8 80A058E8 AFA20068 */ sw $v0, 0x0068($sp) -/* 03CBC 80A058EC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 03CC0 80A058F0 24070AAA */ addiu $a3, $zero, 0x0AAA ## $a3 = 00000AAA -/* 03CC4 80A058F4 0C031AB1 */ jal Graph_OpenDisps -/* 03CC8 80A058F8 AFA50060 */ sw $a1, 0x0060($sp) -/* 03CCC 80A058FC 8FAE0084 */ lw $t6, 0x0084($sp) -/* 03CD0 80A05900 0C0252D6 */ jal func_80094B58 -/* 03CD4 80A05904 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 03CD8 80A05908 960402BE */ lhu $a0, 0x02BE($s0) ## 000002BE -/* 03CDC 80A0590C 8FA80068 */ lw $t0, 0x0068($sp) -/* 03CE0 80A05910 8FA90060 */ lw $t1, 0x0060($sp) -/* 03CE4 80A05914 00800821 */ addu $at, $a0, $zero -/* 03CE8 80A05918 00042080 */ sll $a0, $a0, 2 -/* 03CEC 80A0591C 00812023 */ subu $a0, $a0, $at -/* 03CF0 80A05920 000420C0 */ sll $a0, $a0, 3 -/* 03CF4 80A05924 00812021 */ addu $a0, $a0, $at -/* 03CF8 80A05928 00042040 */ sll $a0, $a0, 1 -/* 03CFC 80A0592C 308401FF */ andi $a0, $a0, 0x01FF ## $a0 = 00000000 -/* 03D00 80A05930 28810100 */ slti $at, $a0, 0x0100 -/* 03D04 80A05934 14200003 */ bne $at, $zero, .L80A05944 -/* 03D08 80A05938 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 03D0C 80A0593C 240F01FF */ addiu $t7, $zero, 0x01FF ## $t7 = 000001FF -/* 03D10 80A05940 01E42023 */ subu $a0, $t7, $a0 -.L80A05944: -/* 03D14 80A05944 860202C2 */ lh $v0, 0x02C2($s0) ## 000002C2 -/* 03D18 80A05948 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 03D1C 80A0594C 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 03D20 80A05950 0441000A */ bgez $v0, .L80A0597C -/* 03D24 80A05954 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 -/* 03D28 80A05958 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 03D2C 80A0595C 3C0180A0 */ lui $at, %hi(D_80A0623C) ## $at = 80A00000 -/* 03D30 80A05960 C432623C */ lwc1 $f18, %lo(D_80A0623C)($at) -/* 03D34 80A05964 46805420 */ cvt.s.w $f16, $f10 -/* 03D38 80A05968 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03D3C 80A0596C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 03D40 80A05970 46128102 */ mul.s $f4, $f16, $f18 -/* 03D44 80A05974 10000004 */ beq $zero, $zero, .L80A05988 -/* 03D48 80A05978 46062000 */ add.s $f0, $f4, $f6 -.L80A0597C: -/* 03D4C 80A0597C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03D50 80A05980 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 03D54 80A05984 00000000 */ nop -.L80A05988: -/* 03D58 80A05988 8D2302D0 */ lw $v1, 0x02D0($t1) ## 000002D0 -/* 03D5C 80A0598C 01001025 */ or $v0, $t0, $zero ## $v0 = 00000000 -/* 03D60 80A05990 356B0001 */ ori $t3, $t3, 0x0001 ## $t3 = FA000001 -/* 03D64 80A05994 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 03D68 80A05998 AD3802D0 */ sw $t8, 0x02D0($t1) ## 000002D0 -/* 03D6C 80A0599C AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 03D70 80A059A0 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 03D74 80A059A4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03D78 80A059A8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 03D7C 80A059AC 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000008 -/* 03D80 80A059B0 01001025 */ or $v0, $t0, $zero ## $v0 = 00000008 -/* 03D84 80A059B4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000008 -/* 03D88 80A059B8 444CF800 */ cfc1 $t4, $31 -/* 03D8C 80A059BC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03D90 80A059C0 44CDF800 */ ctc1 $t5, $31 -/* 03D94 80A059C4 C6080244 */ lwc1 $f8, 0x0244($s0) ## 00000244 -/* 03D98 80A059C8 3C0780A0 */ lui $a3, %hi(func_80A05734) ## $a3 = 80A00000 -/* 03D9C 80A059CC 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000010 -/* 03DA0 80A059D0 460042A4 */ cvt.w.s $f10, $f8 -/* 03DA4 80A059D4 24E75734 */ addiu $a3, $a3, %lo(func_80A05734) ## $a3 = 80A05734 -/* 03DA8 80A059D8 444DF800 */ cfc1 $t5, $31 -/* 03DAC 80A059DC 00000000 */ nop -/* 03DB0 80A059E0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03DB4 80A059E4 11A00012 */ beq $t5, $zero, .L80A05A30 -/* 03DB8 80A059E8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03DBC 80A059EC 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 03DC0 80A059F0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03DC4 80A059F4 460A4281 */ sub.s $f10, $f8, $f10 -/* 03DC8 80A059F8 44CDF800 */ ctc1 $t5, $31 -/* 03DCC 80A059FC 00000000 */ nop -/* 03DD0 80A05A00 460052A4 */ cvt.w.s $f10, $f10 -/* 03DD4 80A05A04 444DF800 */ cfc1 $t5, $31 -/* 03DD8 80A05A08 00000000 */ nop -/* 03DDC 80A05A0C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03DE0 80A05A10 15A00005 */ bne $t5, $zero, .L80A05A28 -/* 03DE4 80A05A14 00000000 */ nop -/* 03DE8 80A05A18 440D5000 */ mfc1 $t5, $f10 -/* 03DEC 80A05A1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03DF0 80A05A20 10000007 */ beq $zero, $zero, .L80A05A40 -/* 03DF4 80A05A24 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80A05A28: -/* 03DF8 80A05A28 10000005 */ beq $zero, $zero, .L80A05A40 -/* 03DFC 80A05A2C 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -.L80A05A30: -/* 03E00 80A05A30 440D5000 */ mfc1 $t5, $f10 -/* 03E04 80A05A34 00000000 */ nop -/* 03E08 80A05A38 05A0FFFB */ bltz $t5, .L80A05A28 -/* 03E0C 80A05A3C 00000000 */ nop -.L80A05A40: -/* 03E10 80A05A40 44CCF800 */ ctc1 $t4, $31 -/* 03E14 80A05A44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03E18 80A05A48 C6100248 */ lwc1 $f16, 0x0248($s0) ## 00000248 -/* 03E1C 80A05A4C 000DC600 */ sll $t8, $t5, 24 -/* 03E20 80A05A50 4459F800 */ cfc1 $t9, $31 -/* 03E24 80A05A54 44CAF800 */ ctc1 $t2, $31 -/* 03E28 80A05A58 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03E2C 80A05A5C 460084A4 */ cvt.w.s $f18, $f16 -/* 03E30 80A05A60 444AF800 */ cfc1 $t2, $31 -/* 03E34 80A05A64 00000000 */ nop -/* 03E38 80A05A68 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03E3C 80A05A6C 51400013 */ beql $t2, $zero, .L80A05ABC -/* 03E40 80A05A70 440A9000 */ mfc1 $t2, $f18 -/* 03E44 80A05A74 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 03E48 80A05A78 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03E4C 80A05A7C 46128481 */ sub.s $f18, $f16, $f18 -/* 03E50 80A05A80 44CAF800 */ ctc1 $t2, $31 -/* 03E54 80A05A84 00000000 */ nop -/* 03E58 80A05A88 460094A4 */ cvt.w.s $f18, $f18 -/* 03E5C 80A05A8C 444AF800 */ cfc1 $t2, $31 -/* 03E60 80A05A90 00000000 */ nop -/* 03E64 80A05A94 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03E68 80A05A98 15400005 */ bne $t2, $zero, .L80A05AB0 -/* 03E6C 80A05A9C 00000000 */ nop -/* 03E70 80A05AA0 440A9000 */ mfc1 $t2, $f18 -/* 03E74 80A05AA4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03E78 80A05AA8 10000007 */ beq $zero, $zero, .L80A05AC8 -/* 03E7C 80A05AAC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80A05AB0: -/* 03E80 80A05AB0 10000005 */ beq $zero, $zero, .L80A05AC8 -/* 03E84 80A05AB4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 03E88 80A05AB8 440A9000 */ mfc1 $t2, $f18 -.L80A05ABC: -/* 03E8C 80A05ABC 00000000 */ nop -/* 03E90 80A05AC0 0540FFFB */ bltz $t2, .L80A05AB0 -/* 03E94 80A05AC4 00000000 */ nop -.L80A05AC8: -/* 03E98 80A05AC8 44D9F800 */ ctc1 $t9, $31 -/* 03E9C 80A05ACC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03EA0 80A05AD0 C604024C */ lwc1 $f4, 0x024C($s0) ## 0000024C -/* 03EA4 80A05AD4 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000FF -/* 03EA8 80A05AD8 444FF800 */ cfc1 $t7, $31 -/* 03EAC 80A05ADC 44D9F800 */ ctc1 $t9, $31 -/* 03EB0 80A05AE0 000C6C00 */ sll $t5, $t4, 16 -/* 03EB4 80A05AE4 030D7025 */ or $t6, $t8, $t5 ## $t6 = FFFFFFFF -/* 03EB8 80A05AE8 460021A4 */ cvt.w.s $f6, $f4 -/* 03EBC 80A05AEC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03EC0 80A05AF0 4459F800 */ cfc1 $t9, $31 -/* 03EC4 80A05AF4 00000000 */ nop -/* 03EC8 80A05AF8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03ECC 80A05AFC 53200013 */ beql $t9, $zero, .L80A05B4C -/* 03ED0 80A05B00 44193000 */ mfc1 $t9, $f6 -/* 03ED4 80A05B04 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 03ED8 80A05B08 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03EDC 80A05B0C 46062181 */ sub.s $f6, $f4, $f6 -/* 03EE0 80A05B10 44D9F800 */ ctc1 $t9, $31 -/* 03EE4 80A05B14 00000000 */ nop -/* 03EE8 80A05B18 460031A4 */ cvt.w.s $f6, $f6 -/* 03EEC 80A05B1C 4459F800 */ cfc1 $t9, $31 -/* 03EF0 80A05B20 00000000 */ nop -/* 03EF4 80A05B24 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03EF8 80A05B28 17200005 */ bne $t9, $zero, .L80A05B40 -/* 03EFC 80A05B2C 00000000 */ nop -/* 03F00 80A05B30 44193000 */ mfc1 $t9, $f6 -/* 03F04 80A05B34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03F08 80A05B38 10000007 */ beq $zero, $zero, .L80A05B58 -/* 03F0C 80A05B3C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80A05B40: -/* 03F10 80A05B40 10000005 */ beq $zero, $zero, .L80A05B58 -/* 03F14 80A05B44 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 03F18 80A05B48 44193000 */ mfc1 $t9, $f6 -.L80A05B4C: -/* 03F1C 80A05B4C 00000000 */ nop -/* 03F20 80A05B50 0720FFFB */ bltz $t9, .L80A05B40 -/* 03F24 80A05B54 00000000 */ nop -.L80A05B58: -/* 03F28 80A05B58 44CFF800 */ ctc1 $t7, $31 -/* 03F2C 80A05B5C C6080250 */ lwc1 $f8, 0x0250($s0) ## 00000250 -/* 03F30 80A05B60 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03F34 80A05B64 332B00FF */ andi $t3, $t9, 0x00FF ## $t3 = 000000FF -/* 03F38 80A05B68 46004282 */ mul.s $f10, $f8, $f0 -/* 03F3C 80A05B6C 000B6200 */ sll $t4, $t3, 8 -/* 03F40 80A05B70 3C19E200 */ lui $t9, 0xE200 ## $t9 = E2000000 -/* 03F44 80A05B74 01CCC025 */ or $t8, $t6, $t4 ## $t8 = FFFFFFFF -/* 03F48 80A05B78 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03F4C 80A05B7C 3739001C */ ori $t9, $t9, 0x001C ## $t9 = E200001C -/* 03F50 80A05B80 444DF800 */ cfc1 $t5, $31 -/* 03F54 80A05B84 44CFF800 */ ctc1 $t7, $31 -/* 03F58 80A05B88 00000000 */ nop -/* 03F5C 80A05B8C 46005424 */ cvt.w.s $f16, $f10 -/* 03F60 80A05B90 444FF800 */ cfc1 $t7, $31 -/* 03F64 80A05B94 00000000 */ nop -/* 03F68 80A05B98 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 03F6C 80A05B9C 51E00013 */ beql $t7, $zero, .L80A05BEC -/* 03F70 80A05BA0 440F8000 */ mfc1 $t7, $f16 -/* 03F74 80A05BA4 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 03F78 80A05BA8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03F7C 80A05BAC 46105401 */ sub.s $f16, $f10, $f16 -/* 03F80 80A05BB0 44CFF800 */ ctc1 $t7, $31 -/* 03F84 80A05BB4 00000000 */ nop -/* 03F88 80A05BB8 46008424 */ cvt.w.s $f16, $f16 -/* 03F8C 80A05BBC 444FF800 */ cfc1 $t7, $31 -/* 03F90 80A05BC0 00000000 */ nop -/* 03F94 80A05BC4 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 03F98 80A05BC8 15E00005 */ bne $t7, $zero, .L80A05BE0 -/* 03F9C 80A05BCC 00000000 */ nop -/* 03FA0 80A05BD0 440F8000 */ mfc1 $t7, $f16 -/* 03FA4 80A05BD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03FA8 80A05BD8 10000007 */ beq $zero, $zero, .L80A05BF8 -/* 03FAC 80A05BDC 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80A05BE0: -/* 03FB0 80A05BE0 10000005 */ beq $zero, $zero, .L80A05BF8 -/* 03FB4 80A05BE4 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 03FB8 80A05BE8 440F8000 */ mfc1 $t7, $f16 -.L80A05BEC: -/* 03FBC 80A05BEC 00000000 */ nop -/* 03FC0 80A05BF0 05E0FFFB */ bltz $t7, .L80A05BE0 -/* 03FC4 80A05BF4 00000000 */ nop -.L80A05BF8: -/* 03FC8 80A05BF8 31EA00FF */ andi $t2, $t7, 0x00FF ## $t2 = 000000FF -/* 03FCC 80A05BFC 030A5825 */ or $t3, $t8, $t2 ## $t3 = FFFFFFFF -/* 03FD0 80A05C00 AC4B0004 */ sw $t3, 0x0004($v0) ## 0000000C -/* 03FD4 80A05C04 960E02C4 */ lhu $t6, 0x02C4($s0) ## 000002C4 -/* 03FD8 80A05C08 44CDF800 */ ctc1 $t5, $31 -/* 03FDC 80A05C0C 3C0ADF00 */ lui $t2, 0xDF00 ## $t2 = DF000000 -/* 03FE0 80A05C10 31CC0004 */ andi $t4, $t6, 0x0004 ## $t4 = 00000004 -/* 03FE4 80A05C14 1180000A */ beq $t4, $zero, .L80A05C40 -/* 03FE8 80A05C18 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 03FEC 80A05C1C 01001025 */ or $v0, $t0, $zero ## $v0 = 00000010 -/* 03FF0 80A05C20 3C0DE200 */ lui $t5, 0xE200 ## $t5 = E2000000 -/* 03FF4 80A05C24 3C0F0C18 */ lui $t7, 0x0C18 ## $t7 = 0C180000 -/* 03FF8 80A05C28 35EF4340 */ ori $t7, $t7, 0x4340 ## $t7 = 0C184340 -/* 03FFC 80A05C2C 35AD001C */ ori $t5, $t5, 0x001C ## $t5 = E200001C -/* 04000 80A05C30 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000010 -/* 04004 80A05C34 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000014 -/* 04008 80A05C38 10000007 */ beq $zero, $zero, .L80A05C58 -/* 0400C 80A05C3C 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000018 -.L80A05C40: -/* 04010 80A05C40 01001025 */ or $v0, $t0, $zero ## $v0 = 00000018 -/* 04014 80A05C44 3C180C18 */ lui $t8, 0x0C18 ## $t8 = 0C180000 -/* 04018 80A05C48 37184B50 */ ori $t8, $t8, 0x4B50 ## $t8 = 0C184B50 -/* 0401C 80A05C4C AC580004 */ sw $t8, 0x0004($v0) ## 0000001C -/* 04020 80A05C50 AC590000 */ sw $t9, 0x0000($v0) ## 00000018 -/* 04024 80A05C54 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000020 -.L80A05C58: -/* 04028 80A05C58 AD0A0000 */ sw $t2, 0x0000($t0) ## 00000020 -/* 0402C 80A05C5C AD000004 */ sw $zero, 0x0004($t0) ## 00000024 -/* 04030 80A05C60 8D2202D0 */ lw $v0, 0x02D0($t1) ## 000002D0 -/* 04034 80A05C64 444CF800 */ cfc1 $t4, $31 -/* 04038 80A05C68 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0403C 80A05C6C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000020 -/* 04040 80A05C70 AD2B02D0 */ sw $t3, 0x02D0($t1) ## 000002D0 -/* 04044 80A05C74 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000018 -/* 04048 80A05C78 44CDF800 */ ctc1 $t5, $31 -/* 0404C 80A05C7C C6120254 */ lwc1 $f18, 0x0254($s0) ## 00000254 -/* 04050 80A05C80 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 04054 80A05C84 46009124 */ cvt.w.s $f4, $f18 -/* 04058 80A05C88 444DF800 */ cfc1 $t5, $31 -/* 0405C 80A05C8C 00000000 */ nop -/* 04060 80A05C90 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04064 80A05C94 51A00013 */ beql $t5, $zero, .L80A05CE4 -/* 04068 80A05C98 440D2000 */ mfc1 $t5, $f4 -/* 0406C 80A05C9C 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 04070 80A05CA0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 04074 80A05CA4 46049101 */ sub.s $f4, $f18, $f4 -/* 04078 80A05CA8 44CDF800 */ ctc1 $t5, $31 -/* 0407C 80A05CAC 00000000 */ nop -/* 04080 80A05CB0 46002124 */ cvt.w.s $f4, $f4 -/* 04084 80A05CB4 444DF800 */ cfc1 $t5, $31 -/* 04088 80A05CB8 00000000 */ nop -/* 0408C 80A05CBC 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04090 80A05CC0 15A00005 */ bne $t5, $zero, .L80A05CD8 -/* 04094 80A05CC4 00000000 */ nop -/* 04098 80A05CC8 440D2000 */ mfc1 $t5, $f4 -/* 0409C 80A05CCC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 040A0 80A05CD0 10000007 */ beq $zero, $zero, .L80A05CF0 -/* 040A4 80A05CD4 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80A05CD8: -/* 040A8 80A05CD8 10000005 */ beq $zero, $zero, .L80A05CF0 -/* 040AC 80A05CDC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 040B0 80A05CE0 440D2000 */ mfc1 $t5, $f4 -.L80A05CE4: -/* 040B4 80A05CE4 00000000 */ nop -/* 040B8 80A05CE8 05A0FFFB */ bltz $t5, .L80A05CD8 -/* 040BC 80A05CEC 00000000 */ nop -.L80A05CF0: -/* 040C0 80A05CF0 44CCF800 */ ctc1 $t4, $31 -/* 040C4 80A05CF4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 040C8 80A05CF8 C6060258 */ lwc1 $f6, 0x0258($s0) ## 00000258 -/* 040CC 80A05CFC 000DC600 */ sll $t8, $t5, 24 -/* 040D0 80A05D00 444AF800 */ cfc1 $t2, $31 -/* 040D4 80A05D04 44CBF800 */ ctc1 $t3, $31 -/* 040D8 80A05D08 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 040DC 80A05D0C 46003224 */ cvt.w.s $f8, $f6 -/* 040E0 80A05D10 444BF800 */ cfc1 $t3, $31 -/* 040E4 80A05D14 00000000 */ nop -/* 040E8 80A05D18 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 040EC 80A05D1C 51600013 */ beql $t3, $zero, .L80A05D6C -/* 040F0 80A05D20 440B4000 */ mfc1 $t3, $f8 -/* 040F4 80A05D24 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 040F8 80A05D28 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 040FC 80A05D2C 46083201 */ sub.s $f8, $f6, $f8 -/* 04100 80A05D30 44CBF800 */ ctc1 $t3, $31 -/* 04104 80A05D34 00000000 */ nop -/* 04108 80A05D38 46004224 */ cvt.w.s $f8, $f8 -/* 0410C 80A05D3C 444BF800 */ cfc1 $t3, $31 -/* 04110 80A05D40 00000000 */ nop -/* 04114 80A05D44 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 04118 80A05D48 15600005 */ bne $t3, $zero, .L80A05D60 -/* 0411C 80A05D4C 00000000 */ nop -/* 04120 80A05D50 440B4000 */ mfc1 $t3, $f8 -/* 04124 80A05D54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04128 80A05D58 10000007 */ beq $zero, $zero, .L80A05D78 -/* 0412C 80A05D5C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L80A05D60: -/* 04130 80A05D60 10000005 */ beq $zero, $zero, .L80A05D78 -/* 04134 80A05D64 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 04138 80A05D68 440B4000 */ mfc1 $t3, $f8 -.L80A05D6C: -/* 0413C 80A05D6C 00000000 */ nop -/* 04140 80A05D70 0560FFFB */ bltz $t3, .L80A05D60 -/* 04144 80A05D74 00000000 */ nop -.L80A05D78: -/* 04148 80A05D78 44CAF800 */ ctc1 $t2, $31 -/* 0414C 80A05D7C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 04150 80A05D80 C60A025C */ lwc1 $f10, 0x025C($s0) ## 0000025C -/* 04154 80A05D84 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 000000FF -/* 04158 80A05D88 4459F800 */ cfc1 $t9, $31 -/* 0415C 80A05D8C 44CAF800 */ ctc1 $t2, $31 -/* 04160 80A05D90 000C6C00 */ sll $t5, $t4, 16 -/* 04164 80A05D94 030D7825 */ or $t7, $t8, $t5 ## $t7 = FFFFFFFF -/* 04168 80A05D98 46005424 */ cvt.w.s $f16, $f10 -/* 0416C 80A05D9C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 04170 80A05DA0 444AF800 */ cfc1 $t2, $31 -/* 04174 80A05DA4 00000000 */ nop -/* 04178 80A05DA8 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 0417C 80A05DAC 51400013 */ beql $t2, $zero, .L80A05DFC -/* 04180 80A05DB0 440A8000 */ mfc1 $t2, $f16 -/* 04184 80A05DB4 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 04188 80A05DB8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0418C 80A05DBC 46105401 */ sub.s $f16, $f10, $f16 -/* 04190 80A05DC0 44CAF800 */ ctc1 $t2, $31 -/* 04194 80A05DC4 00000000 */ nop -/* 04198 80A05DC8 46008424 */ cvt.w.s $f16, $f16 -/* 0419C 80A05DCC 444AF800 */ cfc1 $t2, $31 -/* 041A0 80A05DD0 00000000 */ nop -/* 041A4 80A05DD4 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 041A8 80A05DD8 15400005 */ bne $t2, $zero, .L80A05DF0 -/* 041AC 80A05DDC 00000000 */ nop -/* 041B0 80A05DE0 440A8000 */ mfc1 $t2, $f16 -/* 041B4 80A05DE4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 041B8 80A05DE8 10000007 */ beq $zero, $zero, .L80A05E08 -/* 041BC 80A05DEC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80A05DF0: -/* 041C0 80A05DF0 10000005 */ beq $zero, $zero, .L80A05E08 -/* 041C4 80A05DF4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 041C8 80A05DF8 440A8000 */ mfc1 $t2, $f16 -.L80A05DFC: -/* 041CC 80A05DFC 00000000 */ nop -/* 041D0 80A05E00 0540FFFB */ bltz $t2, .L80A05DF0 -/* 041D4 80A05E04 00000000 */ nop -.L80A05E08: -/* 041D8 80A05E08 44D9F800 */ ctc1 $t9, $31 -/* 041DC 80A05E0C 44849000 */ mtc1 $a0, $f18 ## $f18 = 0.00 -/* 041E0 80A05E10 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 041E4 80A05E14 314E00FF */ andi $t6, $t2, 0x00FF ## $t6 = 000000FF -/* 041E8 80A05E18 46809120 */ cvt.s.w $f4, $f18 -/* 041EC 80A05E1C 000E6200 */ sll $t4, $t6, 8 -/* 041F0 80A05E20 01ECC025 */ or $t8, $t7, $t4 ## $t8 = FFFFFFFF -/* 041F4 80A05E24 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 041F8 80A05E28 46002182 */ mul.s $f6, $f4, $f0 -/* 041FC 80A05E2C 444DF800 */ cfc1 $t5, $31 -/* 04200 80A05E30 44D9F800 */ ctc1 $t9, $31 -/* 04204 80A05E34 00000000 */ nop -/* 04208 80A05E38 46003224 */ cvt.w.s $f8, $f6 -/* 0420C 80A05E3C 4459F800 */ cfc1 $t9, $31 -/* 04210 80A05E40 00000000 */ nop -/* 04214 80A05E44 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 04218 80A05E48 53200013 */ beql $t9, $zero, .L80A05E98 -/* 0421C 80A05E4C 44194000 */ mfc1 $t9, $f8 -/* 04220 80A05E50 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 04224 80A05E54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 04228 80A05E58 46083201 */ sub.s $f8, $f6, $f8 -/* 0422C 80A05E5C 44D9F800 */ ctc1 $t9, $31 -/* 04230 80A05E60 00000000 */ nop -/* 04234 80A05E64 46004224 */ cvt.w.s $f8, $f8 -/* 04238 80A05E68 4459F800 */ cfc1 $t9, $31 -/* 0423C 80A05E6C 00000000 */ nop -/* 04240 80A05E70 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 04244 80A05E74 17200005 */ bne $t9, $zero, .L80A05E8C -/* 04248 80A05E78 00000000 */ nop -/* 0424C 80A05E7C 44194000 */ mfc1 $t9, $f8 -/* 04250 80A05E80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04254 80A05E84 10000007 */ beq $zero, $zero, .L80A05EA4 -/* 04258 80A05E88 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80A05E8C: -/* 0425C 80A05E8C 10000005 */ beq $zero, $zero, .L80A05EA4 -/* 04260 80A05E90 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 04264 80A05E94 44194000 */ mfc1 $t9, $f8 -.L80A05E98: -/* 04268 80A05E98 00000000 */ nop -/* 0426C 80A05E9C 0720FFFB */ bltz $t9, .L80A05E8C -/* 04270 80A05EA0 00000000 */ nop -.L80A05EA4: -/* 04274 80A05EA4 332B00FF */ andi $t3, $t9, 0x00FF ## $t3 = 000000FF -/* 04278 80A05EA8 030B7025 */ or $t6, $t8, $t3 ## $t6 = FFFFFFFF -/* 0427C 80A05EAC AC4E0004 */ sw $t6, 0x0004($v0) ## 0000001C -/* 04280 80A05EB0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 04284 80A05EB4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 04288 80A05EB8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0428C 80A05EBC AFA00010 */ sw $zero, 0x0010($sp) -/* 04290 80A05EC0 8D2F02D0 */ lw $t7, 0x02D0($t1) ## 000002D0 -/* 04294 80A05EC4 44CDF800 */ ctc1 $t5, $31 -/* 04298 80A05EC8 AFA90060 */ sw $t1, 0x0060($sp) -/* 0429C 80A05ECC 8FA40084 */ lw $a0, 0x0084($sp) -/* 042A0 80A05ED0 0C0288A2 */ jal SkelAnime_Draw2 -/* 042A4 80A05ED4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 042A8 80A05ED8 8FA90060 */ lw $t1, 0x0060($sp) -/* 042AC 80A05EDC 3C0680A0 */ lui $a2, %hi(D_80A06134) ## $a2 = 80A00000 -/* 042B0 80A05EE0 24C66134 */ addiu $a2, $a2, %lo(D_80A06134) ## $a2 = 80A06134 -/* 042B4 80A05EE4 AD2202D0 */ sw $v0, 0x02D0($t1) ## 000002D0 -/* 042B8 80A05EE8 8FAC0084 */ lw $t4, 0x0084($sp) -/* 042BC 80A05EEC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 042C0 80A05EF0 24070AE9 */ addiu $a3, $zero, 0x0AE9 ## $a3 = 00000AE9 -/* 042C4 80A05EF4 0C031AD5 */ jal Graph_CloseDisps -/* 042C8 80A05EF8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -.L80A05EFC: -/* 042CC 80A05EFC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A05F00: -/* 042D0 80A05F00 8FB00028 */ lw $s0, 0x0028($sp) -/* 042D4 80A05F04 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 042D8 80A05F08 03E00008 */ jr $ra -/* 042DC 80A05F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s deleted file mode 100644 index 74934e0978..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s +++ /dev/null @@ -1,411 +0,0 @@ -.rdata -glabel D_80A060B0 - .asciz "0" - .balign 4 - -glabel D_80A060B4 - .asciz "../z_en_elf.c" - .balign 4 - -.late_rodata -glabel jtbl_80A06194 - .word L80A025C0 - .word L80A02630 - .word L80A02700 - .word L80A027BC - .word L80A02804 - .word L80A02694 - .word L80A0270C - .word L80A026E8 - -glabel D_80A061B4 - .float 32767.0 - -glabel D_80A061B8 - .float 11.989999771118164 - -.text -glabel EnElf_Init -/* 007E4 80A02414 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 007E8 80A02418 AFBF0034 */ sw $ra, 0x0034($sp) -/* 007EC 80A0241C AFB10030 */ sw $s1, 0x0030($sp) -/* 007F0 80A02420 AFB0002C */ sw $s0, 0x002C($sp) -/* 007F4 80A02424 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 007F8 80A02428 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 007FC 80A0242C 3C0580A0 */ lui $a1, %hi(D_80A06020) ## $a1 = 80A00000 -/* 00800 80A02430 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00804 80A02434 24A56020 */ addiu $a1, $a1, %lo(D_80A06020) ## $a1 = 80A06020 -/* 00808 80A02438 0C01E037 */ jal Actor_ProcessInitChain - -/* 0080C 80A0243C AFAE004C */ sw $t6, 0x004C($sp) -/* 00810 80A02440 3C060401 */ lui $a2, 0x0401 ## $a2 = 04010000 -/* 00814 80A02444 3C070401 */ lui $a3, 0x0401 ## $a3 = 04010000 -/* 00818 80A02448 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 -/* 0081C 80A0244C 261801EA */ addiu $t8, $s0, 0x01EA ## $t8 = 000001EA -/* 00820 80A02450 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 00824 80A02454 AFB90018 */ sw $t9, 0x0018($sp) -/* 00828 80A02458 AFB80014 */ sw $t8, 0x0014($sp) -/* 0082C 80A0245C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00830 80A02460 24E74BA4 */ addiu $a3, $a3, 0x4BA4 ## $a3 = 04014BA4 -/* 00834 80A02464 24C66A48 */ addiu $a2, $a2, 0x6A48 ## $a2 = 04016A48 -/* 00838 80A02468 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0083C 80A0246C 0C02915F */ jal SkelAnime_Init - -/* 00840 80A02470 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00844 80A02474 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00848 80A02478 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0084C 80A0247C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00850 80A02480 0C00AC78 */ jal ActorShape_Init - -/* 00854 80A02484 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 00858 80A02488 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0085C 80A0248C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00860 80A02490 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00864 80A02494 4600218D */ trunc.w.s $f6, $f4 -/* 00868 80A02498 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 0086C 80A0249C A20800C8 */ sb $t0, 0x00C8($s0) ## 000000C8 -/* 00870 80A024A0 4600428D */ trunc.w.s $f10, $f8 -/* 00874 80A024A4 44053000 */ mfc1 $a1, $f6 -/* 00878 80A024A8 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 0087C 80A024AC 4600848D */ trunc.w.s $f18, $f16 -/* 00880 80A024B0 44065000 */ mfc1 $a2, $f10 -/* 00884 80A024B4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00888 80A024B8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 0088C 80A024BC 44079000 */ mfc1 $a3, $f18 -/* 00890 80A024C0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00894 80A024C4 00052C00 */ sll $a1, $a1, 16 -/* 00898 80A024C8 00063400 */ sll $a2, $a2, 16 -/* 0089C 80A024CC 00073C00 */ sll $a3, $a3, 16 -/* 008A0 80A024D0 00073C03 */ sra $a3, $a3, 16 -/* 008A4 80A024D4 00063403 */ sra $a2, $a2, 16 -/* 008A8 80A024D8 00052C03 */ sra $a1, $a1, 16 -/* 008AC 80A024DC AFAE0018 */ sw $t6, 0x0018($sp) -/* 008B0 80A024E0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 008B4 80A024E4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 008B8 80A024E8 AFA4003C */ sw $a0, 0x003C($sp) -/* 008BC 80A024EC 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 008C0 80A024F0 AFA0001C */ sw $zero, 0x001C($sp) -/* 008C4 80A024F4 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 008C8 80A024F8 AFA50040 */ sw $a1, 0x0040($sp) -/* 008CC 80A024FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008D0 80A02500 0C01E9D9 */ jal LightContext_InsertLight - -/* 008D4 80A02504 8FA6003C */ lw $a2, 0x003C($sp) -/* 008D8 80A02508 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 008DC 80A0250C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 008E0 80A02510 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 008E4 80A02514 4600218D */ trunc.w.s $f6, $f4 -/* 008E8 80A02518 AE020274 */ sw $v0, 0x0274($s0) ## 00000274 -/* 008EC 80A0251C 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 008F0 80A02520 4600428D */ trunc.w.s $f10, $f8 -/* 008F4 80A02524 44053000 */ mfc1 $a1, $f6 -/* 008F8 80A02528 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 008FC 80A0252C 4600848D */ trunc.w.s $f18, $f16 -/* 00900 80A02530 44065000 */ mfc1 $a2, $f10 -/* 00904 80A02534 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00908 80A02538 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 0090C 80A0253C 44079000 */ mfc1 $a3, $f18 -/* 00910 80A02540 00052C00 */ sll $a1, $a1, 16 -/* 00914 80A02544 00063400 */ sll $a2, $a2, 16 -/* 00918 80A02548 00073C00 */ sll $a3, $a3, 16 -/* 0091C 80A0254C 00073C03 */ sra $a3, $a3, 16 -/* 00920 80A02550 00063403 */ sra $a2, $a2, 16 -/* 00924 80A02554 00052C03 */ sra $a1, $a1, 16 -/* 00928 80A02558 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0092C 80A0255C AFA90014 */ sw $t1, 0x0014($sp) -/* 00930 80A02560 AFA80010 */ sw $t0, 0x0010($sp) -/* 00934 80A02564 AFA4003C */ sw $a0, 0x003C($sp) -/* 00938 80A02568 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 0093C 80A0256C AFA0001C */ sw $zero, 0x001C($sp) -/* 00940 80A02570 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00944 80A02574 8FA50040 */ lw $a1, 0x0040($sp) -/* 00948 80A02578 0C01E9D9 */ jal LightContext_InsertLight - -/* 0094C 80A0257C 8FA6003C */ lw $a2, 0x003C($sp) -/* 00950 80A02580 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00954 80A02584 240B0258 */ addiu $t3, $zero, 0x0258 ## $t3 = 00000258 -/* 00958 80A02588 AE020288 */ sw $v0, 0x0288($s0) ## 00000288 -/* 0095C 80A0258C A60002C4 */ sh $zero, 0x02C4($s0) ## 000002C4 -/* 00960 80A02590 A60B02C2 */ sh $t3, 0x02C2($s0) ## 000002C2 -/* 00964 80A02594 E60402A4 */ swc1 $f4, 0x02A4($s0) ## 000002A4 -/* 00968 80A02598 AFA00048 */ sw $zero, 0x0048($sp) -/* 0096C 80A0259C 960C001C */ lhu $t4, 0x001C($s0) ## 0000001C -/* 00970 80A025A0 2D810008 */ sltiu $at, $t4, 0x0008 -/* 00974 80A025A4 102000BA */ beq $at, $zero, .L80A02890 -/* 00978 80A025A8 000C6080 */ sll $t4, $t4, 2 -/* 0097C 80A025AC 3C0180A0 */ lui $at, %hi(jtbl_80A06194) ## $at = 80A00000 -/* 00980 80A025B0 002C0821 */ addu $at, $at, $t4 -/* 00984 80A025B4 8C2C6194 */ lw $t4, %lo(jtbl_80A06194)($at) -/* 00988 80A025B8 01800008 */ jr $t4 -/* 0098C 80A025BC 00000000 */ nop -glabel L80A025C0 -/* 00990 80A025C0 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 00994 80A025C4 3C0580A0 */ lui $a1, %hi(func_80A03CF8) ## $a1 = 80A00000 -/* 00998 80A025C8 A20D0003 */ sb $t5, 0x0003($s0) ## 00000003 -/* 0099C 80A025CC 24A53CF8 */ addiu $a1, $a1, %lo(func_80A03CF8) ## $a1 = 80A03CF8 -/* 009A0 80A025D0 0C28070C */ jal func_80A01C30 -/* 009A4 80A025D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009A8 80A025D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009AC 80A025DC 0C28070E */ jal func_80A01C38 -/* 009B0 80A025E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009B4 80A025E4 960E02C4 */ lhu $t6, 0x02C4($s0) ## 000002C4 -/* 009B8 80A025E8 3C1880A0 */ lui $t8, %hi(func_80A053F0) ## $t8 = 80A00000 -/* 009BC 80A025EC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 009C0 80A025F0 271853F0 */ addiu $t8, $t8, %lo(func_80A053F0) ## $t8 = 80A053F0 -/* 009C4 80A025F4 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 009C8 80A025F8 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 009CC 80A025FC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 009D0 80A02600 A60F02C4 */ sh $t7, 0x02C4($s0) ## 000002C4 -/* 009D4 80A02604 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 -/* 009D8 80A02608 AE000298 */ sw $zero, 0x0298($s0) ## 00000298 -/* 009DC 80A0260C A21902C7 */ sb $t9, 0x02C7($s0) ## 000002C7 -/* 009E0 80A02610 94620038 */ lhu $v0, 0x0038($v1) ## 8015E698 -/* 009E4 80A02614 284164C8 */ slti $at, $v0, 0x64C8 -/* 009E8 80A02618 10200003 */ beq $at, $zero, .L80A02628 -/* 009EC 80A0261C 28410BB8 */ slti $at, $v0, 0x0BB8 -/* 009F0 80A02620 502000A2 */ beql $at, $zero, .L80A028AC -/* 009F4 80A02624 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A02628: -/* 009F8 80A02628 1000009F */ beq $zero, $zero, .L80A028A8 -/* 009FC 80A0262C A4600038 */ sh $zero, 0x0038($v1) ## 8015E698 -glabel L80A02630 -/* 00A00 80A02630 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00A04 80A02634 3C0580A0 */ lui $a1, %hi(func_80A03610) ## $a1 = 80A00000 -/* 00A08 80A02638 AFA80048 */ sw $t0, 0x0048($sp) -/* 00A0C 80A0263C 24A53610 */ addiu $a1, $a1, %lo(func_80A03610) ## $a1 = 80A03610 -/* 00A10 80A02640 0C28070C */ jal func_80A01C30 -/* 00A14 80A02644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A18 80A02648 8FA5004C */ lw $a1, 0x004C($sp) -/* 00A1C 80A0264C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00A20 80A02650 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 00A24 80A02654 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 00A28 80A02658 E60002B8 */ swc1 $f0, 0x02B8($s0) ## 000002B8 -/* 00A2C 80A0265C 8FA9004C */ lw $t1, 0x004C($sp) -/* 00A30 80A02660 240BF000 */ addiu $t3, $zero, 0xF000 ## $t3 = FFFFF000 -/* 00A34 80A02664 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00A38 80A02668 852A00B6 */ lh $t2, 0x00B6($t1) ## 000000B6 -/* 00A3C 80A0266C A60B02B0 */ sh $t3, 0x02B0($s0) ## 000002B0 -/* 00A40 80A02670 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00A44 80A02674 A60A02AC */ sh $t2, 0x02AC($s0) ## 000002AC -/* 00A48 80A02678 8FAC004C */ lw $t4, 0x004C($sp) -/* 00A4C 80A0267C C5880028 */ lwc1 $f8, 0x0028($t4) ## 00000028 -/* 00A50 80A02680 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 00A54 80A02684 E61002B4 */ swc1 $f16, 0x02B4($s0) ## 000002B4 -/* 00A58 80A02688 46083281 */ sub.s $f10, $f6, $f8 -/* 00A5C 80A0268C 10000086 */ beq $zero, $zero, .L80A028A8 -/* 00A60 80A02690 E60A0290 */ swc1 $f10, 0x0290($s0) ## 00000290 -glabel L80A02694 -/* 00A64 80A02694 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 00A68 80A02698 3C0580A0 */ lui $a1, %hi(func_80A03990) ## $a1 = 80A00000 -/* 00A6C 80A0269C AFAD0048 */ sw $t5, 0x0048($sp) -/* 00A70 80A026A0 24A53990 */ addiu $a1, $a1, %lo(func_80A03990) ## $a1 = 80A03990 -/* 00A74 80A026A4 0C28070C */ jal func_80A01C30 -/* 00A78 80A026A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A7C 80A026AC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00A80 80A026B0 8FA2004C */ lw $v0, 0x004C($sp) -/* 00A84 80A026B4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00A88 80A026B8 E61202B8 */ swc1 $f18, 0x02B8($s0) ## 000002B8 -/* 00A8C 80A026BC 844E00B6 */ lh $t6, 0x00B6($v0) ## 000000B6 -/* 00A90 80A026C0 A60002B0 */ sh $zero, 0x02B0($s0) ## 000002B0 -/* 00A94 80A026C4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 00A98 80A026C8 A60E02AC */ sh $t6, 0x02AC($s0) ## 000002AC -/* 00A9C 80A026CC C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 -/* 00AA0 80A026D0 44815000 */ mtc1 $at, $f10 ## $f10 = 7.00 -/* 00AA4 80A026D4 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 00AA8 80A026D8 46062201 */ sub.s $f8, $f4, $f6 -/* 00AAC 80A026DC E60A02B4 */ swc1 $f10, 0x02B4($s0) ## 000002B4 -/* 00AB0 80A026E0 10000071 */ beq $zero, $zero, .L80A028A8 -/* 00AB4 80A026E4 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 -glabel L80A026E8 -/* 00AB8 80A026E8 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 00ABC 80A026EC 3C198003 */ lui $t9, %hi(ActorShadow_DrawFunc_WhiteCircle) -/* 00AC0 80A026F0 2739B614 */ addiu $t9, %lo(ActorShadow_DrawFunc_WhiteCircle) -/* 00AC4 80A026F4 35F80200 */ ori $t8, $t7, 0x0200 ## $t8 = 00000200 -/* 00AC8 80A026F8 A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 -/* 00ACC 80A026FC AE1900C0 */ sw $t9, 0x00C0($s0) ## 000000C0 -glabel L80A02700 -/* 00AD0 80A02700 960802C4 */ lhu $t0, 0x02C4($s0) ## 000002C4 -/* 00AD4 80A02704 35090100 */ ori $t1, $t0, 0x0100 ## $t1 = 00000100 -/* 00AD8 80A02708 A60902C4 */ sh $t1, 0x02C4($s0) ## 000002C4 -glabel L80A0270C -/* 00ADC 80A0270C 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00AE0 80A02710 3C0580A0 */ lui $a1, %hi(func_80A0329C) ## $a1 = 80A00000 -/* 00AE4 80A02714 AFAA0048 */ sw $t2, 0x0048($sp) -/* 00AE8 80A02718 24A5329C */ addiu $a1, $a1, %lo(func_80A0329C) ## $a1 = 80A0329C -/* 00AEC 80A0271C 0C28070C */ jal func_80A01C30 -/* 00AF0 80A02720 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF4 80A02724 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00AF8 80A02728 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00AFC 80A0272C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00B00 80A02730 00000000 */ nop -/* 00B04 80A02734 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B08 80A02738 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00B0C 80A0273C 3C014483 */ lui $at, 0x4483 ## $at = 44830000 -/* 00B10 80A02740 44816000 */ mtc1 $at, $f12 ## $f12 = 1048.00 -/* 00B14 80A02744 46100480 */ add.s $f18, $f0, $f16 -/* 00B18 80A02748 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 00B1C 80A0274C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00B20 80A02750 E61202B4 */ swc1 $f18, 0x02B4($s0) ## 000002B4 -/* 00B24 80A02754 4600010D */ trunc.w.s $f4, $f0 -/* 00B28 80A02758 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 -/* 00B2C 80A0275C 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 00B30 80A02760 3C0180A0 */ lui $at, %hi(D_80A061B4) ## $at = 80A00000 -/* 00B34 80A02764 440E2000 */ mfc1 $t6, $f4 -/* 00B38 80A02768 AE19028C */ sw $t9, 0x028C($s0) ## 0000028C -/* 00B3C 80A0276C 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C -/* 00B40 80A02770 25CF0200 */ addiu $t7, $t6, 0x0200 ## $t7 = 00000200 -/* 00B44 80A02774 A60F02AE */ sh $t7, 0x02AE($s0) ## 000002AE -/* 00B48 80A02778 AE180290 */ sw $t8, 0x0290($s0) ## 00000290 -/* 00B4C 80A0277C AE190294 */ sw $t9, 0x0294($s0) ## 00000294 -/* 00B50 80A02780 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00B54 80A02784 C42C61B4 */ lwc1 $f12, %lo(D_80A061B4)($at) -/* 00B58 80A02788 4600018D */ trunc.w.s $f6, $f0 -/* 00B5C 80A0278C 3C0A80A0 */ lui $t2, %hi(func_80A0214C) ## $t2 = 80A00000 -/* 00B60 80A02790 254A214C */ addiu $t2, $t2, %lo(func_80A0214C) ## $t2 = 80A0214C -/* 00B64 80A02794 AE0A02C8 */ sw $t2, 0x02C8($s0) ## 000002C8 -/* 00B68 80A02798 44093000 */ mfc1 $t1, $f6 -/* 00B6C 80A0279C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B70 80A027A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00B74 80A027A4 0C2808CB */ jal func_80A0232C -/* 00B78 80A027A8 A60902BC */ sh $t1, 0x02BC($s0) ## 000002BC -/* 00B7C 80A027AC 240B00F0 */ addiu $t3, $zero, 0x00F0 ## $t3 = 000000F0 -/* 00B80 80A027B0 A60002C0 */ sh $zero, 0x02C0($s0) ## 000002C0 -/* 00B84 80A027B4 1000003C */ beq $zero, $zero, .L80A028A8 -/* 00B88 80A027B8 A60B02C2 */ sh $t3, 0x02C2($s0) ## 000002C2 -glabel L80A027BC -/* 00B8C 80A027BC 3C0180A0 */ lui $at, %hi(D_80A061B8) ## $at = 80A00000 -/* 00B90 80A027C0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00B94 80A027C4 C42C61B8 */ lwc1 $f12, %lo(D_80A061B8)($at) -/* 00B98 80A027C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00B9C 80A027CC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00BA0 80A027D0 3C0580A0 */ lui $a1, %hi(func_80A0353C) ## $a1 = 80A00000 -/* 00BA4 80A027D4 24A5353C */ addiu $a1, $a1, %lo(func_80A0353C) ## $a1 = 80A0353C -/* 00BA8 80A027D8 46080280 */ add.s $f10, $f0, $f8 -/* 00BAC 80A027DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB0 80A027E0 4600540D */ trunc.w.s $f16, $f10 -/* 00BB4 80A027E4 440D8000 */ mfc1 $t5, $f16 -/* 00BB8 80A027E8 0C28070C */ jal func_80A01C30 -/* 00BBC 80A027EC AFAD0048 */ sw $t5, 0x0048($sp) -/* 00BC0 80A027F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BC4 80A027F4 0C28070E */ jal func_80A01C38 -/* 00BC8 80A027F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00BCC 80A027FC 1000002B */ beq $zero, $zero, .L80A028AC -/* 00BD0 80A02800 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -glabel L80A02804 -/* 00BD4 80A02804 3C0580A0 */ lui $a1, %hi(func_80A03604) ## $a1 = 80A00000 -/* 00BD8 80A02808 24A53604 */ addiu $a1, $a1, %lo(func_80A03604) ## $a1 = 80A03604 -/* 00BDC 80A0280C 0C28070C */ jal func_80A01C30 -/* 00BE0 80A02810 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BE4 80A02814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BE8 80A02818 0C28070E */ jal func_80A01C38 -/* 00BEC 80A0281C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00BF0 80A02820 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00BF4 80A02824 AFA40040 */ sw $a0, 0x0040($sp) -/* 00BF8 80A02828 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00BFC 80A0282C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -.L80A02830: -/* 00C00 80A02830 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 00C04 80A02834 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 00C08 80A02838 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00C0C 80A0283C 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 00C10 80A02840 46049181 */ sub.s $f6, $f18, $f4 -/* 00C14 80A02844 8FA40040 */ lw $a0, 0x0040($sp) -/* 00C18 80A02848 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C1C 80A0284C 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 00C20 80A02850 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00C24 80A02854 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00C28 80A02858 AFA30044 */ sw $v1, 0x0044($sp) -/* 00C2C 80A0285C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00C30 80A02860 AFA00020 */ sw $zero, 0x0020($sp) -/* 00C34 80A02864 AFA0001C */ sw $zero, 0x001C($sp) -/* 00C38 80A02868 AFA00018 */ sw $zero, 0x0018($sp) -/* 00C3C 80A0286C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00C40 80A02870 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00C44 80A02874 8FA30044 */ lw $v1, 0x0044($sp) -/* 00C48 80A02878 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00C4C 80A0287C 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00C50 80A02880 5461FFEB */ bnel $v1, $at, .L80A02830 -/* 00C54 80A02884 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00C58 80A02888 10000008 */ beq $zero, $zero, .L80A028AC -/* 00C5C 80A0288C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A02890: -/* 00C60 80A02890 3C0480A0 */ lui $a0, %hi(D_80A060B0) ## $a0 = 80A00000 -/* 00C64 80A02894 3C0580A0 */ lui $a1, %hi(D_80A060B4) ## $a1 = 80A00000 -/* 00C68 80A02898 24A560B4 */ addiu $a1, $a1, %lo(D_80A060B4) ## $a1 = 80A060B4 -/* 00C6C 80A0289C 248460B0 */ addiu $a0, $a0, %lo(D_80A060B0) ## $a0 = 80A060B0 -/* 00C70 80A028A0 0C0007FC */ jal __assert - -/* 00C74 80A028A4 2406044F */ addiu $a2, $zero, 0x044F ## $a2 = 0000044F -.L80A028A8: -/* 00C78 80A028A8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A028AC: -/* 00C7C 80A028AC 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 00C80 80A028B0 3C0480A0 */ lui $a0, %hi(D_80A06024) ## $a0 = 80A00000 -/* 00C84 80A028B4 24846024 */ addiu $a0, $a0, %lo(D_80A06024) ## $a0 = 80A06024 -/* 00C88 80A028B8 E60A02A0 */ swc1 $f10, 0x02A0($s0) ## 000002A0 -/* 00C8C 80A028BC 8C980000 */ lw $t8, 0x0000($a0) ## 80A06024 -/* 00C90 80A028C0 26030244 */ addiu $v1, $s0, 0x0244 ## $v1 = 00000244 -/* 00C94 80A028C4 3C0980A0 */ lui $t1, %hi(D_80A06064) ## $t1 = 80A00000 -/* 00C98 80A028C8 AC780000 */ sw $t8, 0x0000($v1) ## 00000244 -/* 00C9C 80A028CC 8C8F0004 */ lw $t7, 0x0004($a0) ## 80A06028 -/* 00CA0 80A028D0 25296064 */ addiu $t1, $t1, %lo(D_80A06064) ## $t1 = 80A06064 -/* 00CA4 80A028D4 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000248 -/* 00CA8 80A028D8 8C980008 */ lw $t8, 0x0008($a0) ## 80A0602C -/* 00CAC 80A028DC AC780008 */ sw $t8, 0x0008($v1) ## 0000024C -/* 00CB0 80A028E0 8C8F000C */ lw $t7, 0x000C($a0) ## 80A06030 -/* 00CB4 80A028E4 AC6F000C */ sw $t7, 0x000C($v1) ## 00000250 -/* 00CB8 80A028E8 8FB90048 */ lw $t9, 0x0048($sp) -/* 00CBC 80A028EC 8FA20048 */ lw $v0, 0x0048($sp) -/* 00CC0 80A028F0 1B200010 */ blez $t9, .L80A02934 -/* 00CC4 80A028F4 00021023 */ subu $v0, $zero, $v0 -/* 00CC8 80A028F8 00194080 */ sll $t0, $t9, 2 -/* 00CCC 80A028FC 01194023 */ subu $t0, $t0, $t9 -/* 00CD0 80A02900 01098821 */ addu $s1, $t0, $t1 -/* 00CD4 80A02904 0C2808E9 */ jal func_80A023A4 -/* 00CD8 80A02908 92240000 */ lbu $a0, 0x0000($s1) ## 00000000 -/* 00CDC 80A0290C E6000254 */ swc1 $f0, 0x0254($s0) ## 00000254 -/* 00CE0 80A02910 0C2808E9 */ jal func_80A023A4 -/* 00CE4 80A02914 92240001 */ lbu $a0, 0x0001($s1) ## 00000001 -/* 00CE8 80A02918 E6000258 */ swc1 $f0, 0x0258($s0) ## 00000258 -/* 00CEC 80A0291C 0C2808E9 */ jal func_80A023A4 -/* 00CF0 80A02920 92240002 */ lbu $a0, 0x0002($s1) ## 00000002 -/* 00CF4 80A02924 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00CF8 80A02928 E600025C */ swc1 $f0, 0x025C($s0) ## 0000025C -/* 00CFC 80A0292C 10000016 */ beq $zero, $zero, .L80A02988 -/* 00D00 80A02930 E6100260 */ swc1 $f16, 0x0260($s0) ## 00000260 -.L80A02934: -/* 00D04 80A02934 00021100 */ sll $v0, $v0, 4 -/* 00D08 80A02938 00825021 */ addu $t2, $a0, $v0 -/* 00D0C 80A0293C 8D4C0000 */ lw $t4, 0x0000($t2) ## 00000000 -/* 00D10 80A02940 3C0D80A0 */ lui $t5, %hi(D_80A06044) ## $t5 = 80A00000 -/* 00D14 80A02944 25AD6044 */ addiu $t5, $t5, %lo(D_80A06044) ## $t5 = 80A06044 -/* 00D18 80A02948 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00D1C 80A0294C 8D4B0004 */ lw $t3, 0x0004($t2) ## 00000004 -/* 00D20 80A02950 004D7021 */ addu $t6, $v0, $t5 -/* 00D24 80A02954 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 00D28 80A02958 8D4C0008 */ lw $t4, 0x0008($t2) ## 00000008 -/* 00D2C 80A0295C AC6C0008 */ sw $t4, 0x0008($v1) ## 00000008 -/* 00D30 80A02960 8D4B000C */ lw $t3, 0x000C($t2) ## 0000000C -/* 00D34 80A02964 AC6B000C */ sw $t3, 0x000C($v1) ## 0000000C -/* 00D38 80A02968 8DD80000 */ lw $t8, 0x0000($t6) ## 00000000 -/* 00D3C 80A0296C AE180254 */ sw $t8, 0x0254($s0) ## 00000254 -/* 00D40 80A02970 8DCF0004 */ lw $t7, 0x0004($t6) ## 00000004 -/* 00D44 80A02974 AE0F0258 */ sw $t7, 0x0258($s0) ## 00000258 -/* 00D48 80A02978 8DD80008 */ lw $t8, 0x0008($t6) ## 00000008 -/* 00D4C 80A0297C AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -/* 00D50 80A02980 8DCF000C */ lw $t7, 0x000C($t6) ## 0000000C -/* 00D54 80A02984 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -.L80A02988: -/* 00D58 80A02988 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00D5C 80A0298C 8FB0002C */ lw $s0, 0x002C($sp) -/* 00D60 80A02990 8FB10030 */ lw $s1, 0x0030($sp) -/* 00D64 80A02994 03E00008 */ jr $ra -/* 00D68 80A02998 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s deleted file mode 100644 index 00d74b2af6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel EnElf_Update -/* 03AAC 80A056DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03AB0 80A056E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03AB4 80A056E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03AB8 80A056E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 03ABC 80A056EC 8C9902CC */ lw $t9, 0x02CC($a0) ## 000002CC -/* 03AC0 80A056F0 0320F809 */ jalr $ra, $t9 -/* 03AC4 80A056F4 00000000 */ nop -/* 03AC8 80A056F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 03ACC 80A056FC 948F02BE */ lhu $t7, 0x02BE($a0) ## 000002BE -/* 03AD0 80A05700 948802C4 */ lhu $t0, 0x02C4($a0) ## 000002C4 -/* 03AD4 80A05704 848E02BC */ lh $t6, 0x02BC($a0) ## 000002BC -/* 03AD8 80A05708 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 03ADC 80A0570C 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 03AE0 80A05710 A49802BE */ sh $t8, 0x02BE($a0) ## 000002BE -/* 03AE4 80A05714 11200003 */ beq $t1, $zero, .L80A05724 -/* 03AE8 80A05718 A48E00B6 */ sh $t6, 0x00B6($a0) ## 000000B6 -/* 03AEC 80A0571C 0C281364 */ jal func_80A04D90 -/* 03AF0 80A05720 8FA5001C */ lw $a1, 0x001C($sp) -.L80A05724: -/* 03AF4 80A05724 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03AF8 80A05728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03AFC 80A0572C 03E00008 */ jr $ra -/* 03B00 80A05730 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s deleted file mode 100644 index e02dc557e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A01C30 -/* 00000 80A01C30 03E00008 */ jr $ra -/* 00004 80A01C34 AC8502CC */ sw $a1, 0x02CC($a0) ## 000002CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s deleted file mode 100644 index 48d0109d99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s +++ /dev/null @@ -1,246 +0,0 @@ -.late_rodata -glabel jtbl_80A06144 - .word L80A01C60 - .word L80A01DE0 - .word L80A01E24 - .word L80A01E68 - .word L80A01E94 - .word L80A01ED0 - .word L80A01F04 - .word L80A01D70 - .word L80A01DA8 - .word L80A01D2C - .word L80A01CF0 - .word L80A01F48 - .word L80A01CAC - -.text -glabel func_80A01C38 -/* 00008 80A01C38 30AEFFFF */ andi $t6, $a1, 0xFFFF ## $t6 = 00000000 -/* 0000C 80A01C3C 2DC1000D */ sltiu $at, $t6, 0x000D -/* 00010 80A01C40 102000D1 */ beq $at, $zero, .L80A01F88 -/* 00014 80A01C44 A48502A8 */ sh $a1, 0x02A8($a0) ## 000002A8 -/* 00018 80A01C48 000E7080 */ sll $t6, $t6, 2 -/* 0001C 80A01C4C 3C0180A0 */ lui $at, %hi(jtbl_80A06144) ## $at = 80A00000 -/* 00020 80A01C50 002E0821 */ addu $at, $at, $t6 -/* 00024 80A01C54 8C2E6144 */ lw $t6, %lo(jtbl_80A06144)($at) -/* 00028 80A01C58 01C00008 */ jr $t6 -/* 0002C 80A01C5C 00000000 */ nop -glabel L80A01C60 -/* 00030 80A01C60 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00034 80A01C64 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00038 80A01C68 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0003C 80A01C6C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00040 80A01C70 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00044 80A01C74 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 00048 80A01C78 3C1980A0 */ lui $t9, %hi(func_80A02A20) ## $t9 = 80A00000 -/* 0004C 80A01C7C 240F0400 */ addiu $t7, $zero, 0x0400 ## $t7 = 00000400 -/* 00050 80A01C80 24180200 */ addiu $t8, $zero, 0x0200 ## $t8 = 00000200 -/* 00054 80A01C84 27392A20 */ addiu $t9, $t9, %lo(func_80A02A20) ## $t9 = 80A02A20 -/* 00058 80A01C88 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 0005C 80A01C8C A48F02AE */ sh $t7, 0x02AE($a0) ## 000002AE -/* 00060 80A01C90 A49802B0 */ sh $t8, 0x02B0($a0) ## 000002B0 -/* 00064 80A01C94 AC9902C8 */ sw $t9, 0x02C8($a0) ## 000002C8 -/* 00068 80A01C98 A48802C0 */ sh $t0, 0x02C0($a0) ## 000002C0 -/* 0006C 80A01C9C E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00070 80A01CA0 E48402B4 */ swc1 $f4, 0x02B4($a0) ## 000002B4 -/* 00074 80A01CA4 03E00008 */ jr $ra -/* 00078 80A01CA8 E48602B8 */ swc1 $f6, 0x02B8($a0) ## 000002B8 -glabel L80A01CAC -/* 0007C 80A01CAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00080 80A01CB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00084 80A01CB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00088 80A01CB8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 0008C 80A01CBC 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 -/* 00090 80A01CC0 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 -/* 00094 80A01CC4 240A0200 */ addiu $t2, $zero, 0x0200 ## $t2 = 00000200 -/* 00098 80A01CC8 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 -/* 0009C 80A01CCC 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 000A0 80A01CD0 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 000A4 80A01CD4 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 000A8 80A01CD8 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 000AC 80A01CDC A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 -/* 000B0 80A01CE0 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 -/* 000B4 80A01CE4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 000B8 80A01CE8 03E00008 */ jr $ra -/* 000BC 80A01CEC E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 -glabel L80A01CF0 -/* 000C0 80A01CF0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 000C4 80A01CF4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 000C8 80A01CF8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 000CC 80A01CFC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 000D0 80A01D00 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 000D4 80A01D04 3C0E80A0 */ lui $t6, %hi(func_80A02A20) ## $t6 = 80A00000 -/* 000D8 80A01D08 240D0400 */ addiu $t5, $zero, 0x0400 ## $t5 = 00000400 -/* 000DC 80A01D0C 25CE2A20 */ addiu $t6, $t6, %lo(func_80A02A20) ## $t6 = 80A02A20 -/* 000E0 80A01D10 A48D02AE */ sh $t5, 0x02AE($a0) ## 000002AE -/* 000E4 80A01D14 A48002B0 */ sh $zero, 0x02B0($a0) ## 000002B0 -/* 000E8 80A01D18 AC8E02C8 */ sw $t6, 0x02C8($a0) ## 000002C8 -/* 000EC 80A01D1C E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 000F0 80A01D20 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 000F4 80A01D24 03E00008 */ jr $ra -/* 000F8 80A01D28 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 -glabel L80A01D2C -/* 000FC 80A01D2C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00100 80A01D30 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00104 80A01D34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00108 80A01D38 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 0010C 80A01D3C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00110 80A01D40 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 00114 80A01D44 3C1980A0 */ lui $t9, %hi(func_80A02A20) ## $t9 = 80A00000 -/* 00118 80A01D48 240F1000 */ addiu $t7, $zero, 0x1000 ## $t7 = 00001000 -/* 0011C 80A01D4C 24180200 */ addiu $t8, $zero, 0x0200 ## $t8 = 00000200 -/* 00120 80A01D50 27392A20 */ addiu $t9, $t9, %lo(func_80A02A20) ## $t9 = 80A02A20 -/* 00124 80A01D54 A48F02AE */ sh $t7, 0x02AE($a0) ## 000002AE -/* 00128 80A01D58 A49802B0 */ sh $t8, 0x02B0($a0) ## 000002B0 -/* 0012C 80A01D5C AC9902C8 */ sw $t9, 0x02C8($a0) ## 000002C8 -/* 00130 80A01D60 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00134 80A01D64 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 00138 80A01D68 03E00008 */ jr $ra -/* 0013C 80A01D6C E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 -glabel L80A01D70 -/* 00140 80A01D70 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00144 80A01D74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00148 80A01D78 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0014C 80A01D7C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 -/* 00150 80A01D80 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 -/* 00154 80A01D84 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 00158 80A01D88 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0015C 80A01D8C AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 -/* 00160 80A01D90 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 00164 80A01D94 A48A02C0 */ sh $t2, 0x02C0($a0) ## 000002C0 -/* 00168 80A01D98 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 0016C 80A01D9C E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 00170 80A01DA0 03E00008 */ jr $ra -/* 00174 80A01DA4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -glabel L80A01DA8 -/* 00178 80A01DA8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0017C 80A01DAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00180 80A01DB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00184 80A01DB4 3C0D80A0 */ lui $t5, %hi(func_80A02A20) ## $t5 = 80A00000 -/* 00188 80A01DB8 240B1000 */ addiu $t3, $zero, 0x1000 ## $t3 = 00001000 -/* 0018C 80A01DBC 240C0200 */ addiu $t4, $zero, 0x0200 ## $t4 = 00000200 -/* 00190 80A01DC0 25AD2A20 */ addiu $t5, $t5, %lo(func_80A02A20) ## $t5 = 80A02A20 -/* 00194 80A01DC4 A48B02AE */ sh $t3, 0x02AE($a0) ## 000002AE -/* 00198 80A01DC8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 -/* 0019C 80A01DCC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 -/* 001A0 80A01DD0 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 001A4 80A01DD4 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 001A8 80A01DD8 03E00008 */ jr $ra -/* 001AC 80A01DDC E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -glabel L80A01DE0 -/* 001B0 80A01DE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 001B4 80A01DE4 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 001B8 80A01DE8 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 -/* 001BC 80A01DEC 44812000 */ mtc1 $at, $f4 ## $f4 = 7.50 -/* 001C0 80A01DF0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 001C4 80A01DF4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 001C8 80A01DF8 3C1880A0 */ lui $t8, %hi(func_80A02A20) ## $t8 = 80A00000 -/* 001CC 80A01DFC 240E1000 */ addiu $t6, $zero, 0x1000 ## $t6 = 00001000 -/* 001D0 80A01E00 240F0800 */ addiu $t7, $zero, 0x0800 ## $t7 = 00000800 -/* 001D4 80A01E04 27182A20 */ addiu $t8, $t8, %lo(func_80A02A20) ## $t8 = 80A02A20 -/* 001D8 80A01E08 A48E02AE */ sh $t6, 0x02AE($a0) ## 000002AE -/* 001DC 80A01E0C A48F02B0 */ sh $t7, 0x02B0($a0) ## 000002B0 -/* 001E0 80A01E10 AC9802C8 */ sw $t8, 0x02C8($a0) ## 000002C8 -/* 001E4 80A01E14 E49202B4 */ swc1 $f18, 0x02B4($a0) ## 000002B4 -/* 001E8 80A01E18 E48402B8 */ swc1 $f4, 0x02B8($a0) ## 000002B8 -/* 001EC 80A01E1C 03E00008 */ jr $ra -/* 001F0 80A01E20 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 -glabel L80A01E24 -/* 001F4 80A01E24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001F8 80A01E28 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 001FC 80A01E2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00200 80A01E30 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00204 80A01E34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00208 80A01E38 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 0020C 80A01E3C 3C0980A0 */ lui $t1, %hi(func_80A02AA4) ## $t1 = 80A00000 -/* 00210 80A01E40 24190400 */ addiu $t9, $zero, 0x0400 ## $t9 = 00000400 -/* 00214 80A01E44 24081000 */ addiu $t0, $zero, 0x1000 ## $t0 = 00001000 -/* 00218 80A01E48 25292AA4 */ addiu $t1, $t1, %lo(func_80A02AA4) ## $t1 = 80A02AA4 -/* 0021C 80A01E4C A49902AE */ sh $t9, 0x02AE($a0) ## 000002AE -/* 00220 80A01E50 A48802B0 */ sh $t0, 0x02B0($a0) ## 000002B0 -/* 00224 80A01E54 AC8902C8 */ sw $t1, 0x02C8($a0) ## 000002C8 -/* 00228 80A01E58 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 0022C 80A01E5C E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 00230 80A01E60 03E00008 */ jr $ra -/* 00234 80A01E64 E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 -glabel L80A01E68 -/* 00238 80A01E68 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0023C 80A01E6C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00240 80A01E70 3C0B80A0 */ lui $t3, %hi(func_80A02B38) ## $t3 = 80A00000 -/* 00244 80A01E74 240A0600 */ addiu $t2, $zero, 0x0600 ## $t2 = 00000600 -/* 00248 80A01E78 256B2B38 */ addiu $t3, $t3, %lo(func_80A02B38) ## $t3 = 80A02B38 -/* 0024C 80A01E7C A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 00250 80A01E80 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 00254 80A01E84 E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 -/* 00258 80A01E88 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 -/* 0025C 80A01E8C 03E00008 */ jr $ra -/* 00260 80A01E90 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -glabel L80A01E94 -/* 00264 80A01E94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00268 80A01E98 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 0026C 80A01E9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00270 80A01EA0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00274 80A01EA4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00278 80A01EA8 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 0027C 80A01EAC 3C0D80A0 */ lui $t5, %hi(func_80A02B38) ## $t5 = 80A00000 -/* 00280 80A01EB0 240C0800 */ addiu $t4, $zero, 0x0800 ## $t4 = 00000800 -/* 00284 80A01EB4 25AD2B38 */ addiu $t5, $t5, %lo(func_80A02B38) ## $t5 = 80A02B38 -/* 00288 80A01EB8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 -/* 0028C 80A01EBC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 -/* 00290 80A01EC0 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 -/* 00294 80A01EC4 E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 -/* 00298 80A01EC8 03E00008 */ jr $ra -/* 0029C 80A01ECC E4920168 */ swc1 $f18, 0x0168($a0) ## 00000168 -glabel L80A01ED0 -/* 002A0 80A01ED0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 002A4 80A01ED4 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 002A8 80A01ED8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 002AC 80A01EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 002B0 80A01EE0 3C0F80A0 */ lui $t7, %hi(func_80A02B38) ## $t7 = 80A00000 -/* 002B4 80A01EE4 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 -/* 002B8 80A01EE8 25EF2B38 */ addiu $t7, $t7, %lo(func_80A02B38) ## $t7 = 80A02B38 -/* 002BC 80A01EEC A48E02B0 */ sh $t6, 0x02B0($a0) ## 000002B0 -/* 002C0 80A01EF0 AC8F02C8 */ sw $t7, 0x02C8($a0) ## 000002C8 -/* 002C4 80A01EF4 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 002C8 80A01EF8 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 002CC 80A01EFC 03E00008 */ jr $ra -/* 002D0 80A01F00 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 -glabel L80A01F04 -/* 002D4 80A01F04 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 002D8 80A01F08 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 002DC 80A01F0C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 002E0 80A01F10 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 002E4 80A01F14 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002E8 80A01F18 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 002EC 80A01F1C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 -/* 002F0 80A01F20 24181000 */ addiu $t8, $zero, 0x1000 ## $t8 = 00001000 -/* 002F4 80A01F24 24190800 */ addiu $t9, $zero, 0x0800 ## $t9 = 00000800 -/* 002F8 80A01F28 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 -/* 002FC 80A01F2C A49802AE */ sh $t8, 0x02AE($a0) ## 000002AE -/* 00300 80A01F30 A49902B0 */ sh $t9, 0x02B0($a0) ## 000002B0 -/* 00304 80A01F34 AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 -/* 00308 80A01F38 E48602B4 */ swc1 $f6, 0x02B4($a0) ## 000002B4 -/* 0030C 80A01F3C E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 -/* 00310 80A01F40 03E00008 */ jr $ra -/* 00314 80A01F44 E48A0168 */ swc1 $f10, 0x0168($a0) ## 00000168 -glabel L80A01F48 -/* 00318 80A01F48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0031C 80A01F4C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00320 80A01F50 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00324 80A01F54 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 00328 80A01F58 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 -/* 0032C 80A01F5C 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 -/* 00330 80A01F60 240A2000 */ addiu $t2, $zero, 0x2000 ## $t2 = 00002000 -/* 00334 80A01F64 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 -/* 00338 80A01F68 240C002A */ addiu $t4, $zero, 0x002A ## $t4 = 0000002A -/* 0033C 80A01F6C A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 00340 80A01F70 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 00344 80A01F74 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 00348 80A01F78 A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 -/* 0034C 80A01F7C E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 -/* 00350 80A01F80 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00354 80A01F84 E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 -.L80A01F88: -/* 00358 80A01F88 03E00008 */ jr $ra -/* 0035C 80A01F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s deleted file mode 100644 index f4ae6c5a77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A01F90 -/* 00360 80A01F90 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 00364 80A01F94 C4860000 */ lwc1 $f6, 0x0000($a0) ## 00000000 -/* 00368 80A01F98 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 0036C 80A01F9C C48A0008 */ lwc1 $f10, 0x0008($a0) ## 00000008 -/* 00370 80A01FA0 46062001 */ sub.s $f0, $f4, $f6 -/* 00374 80A01FA4 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00378 80A01FA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0037C 80A01FAC 460A4081 */ sub.s $f2, $f8, $f10 -/* 00380 80A01FB0 46000402 */ mul.s $f16, $f0, $f0 -/* 00384 80A01FB4 00000000 */ nop -/* 00388 80A01FB8 46021482 */ mul.s $f18, $f2, $f2 -/* 0038C 80A01FBC 46128100 */ add.s $f4, $f16, $f18 -/* 00390 80A01FC0 460C6182 */ mul.s $f6, $f12, $f12 -/* 00394 80A01FC4 4604303C */ c.lt.s $f6, $f4 -/* 00398 80A01FC8 00000000 */ nop -/* 0039C 80A01FCC 45000002 */ bc1f .L80A01FD8 -/* 003A0 80A01FD0 00000000 */ nop -/* 003A4 80A01FD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A01FD8: -/* 003A8 80A01FD8 03E00008 */ jr $ra -/* 003AC 80A01FDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s deleted file mode 100644 index 807cc0fbb3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80A06178 - .float 32767.0 - -.text -glabel func_80A01FE0 -/* 003B0 80A01FE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003B4 80A01FE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 003B8 80A01FE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 003BC 80A01FEC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C0 80A01FF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003C4 80A01FF4 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 003C8 80A01FF8 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 003CC 80A01FFC 0C2807E4 */ jal func_80A01F90 -/* 003D0 80A02000 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 003D4 80A02004 14400005 */ bne $v0, $zero, .L80A0201C -/* 003D8 80A02008 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 003DC 80A0200C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003E0 80A02010 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 003E4 80A02014 10000004 */ beq $zero, $zero, .L80A02028 -/* 003E8 80A02018 E60402B8 */ swc1 $f4, 0x02B8($s0) ## 000002B8 -.L80A0201C: -/* 003EC 80A0201C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 003F0 80A02020 00000000 */ nop -/* 003F4 80A02024 E60602B8 */ swc1 $f6, 0x02B8($s0) ## 000002B8 -.L80A02028: -/* 003F8 80A02028 860202C0 */ lh $v0, 0x02C0($s0) ## 000002C0 -/* 003FC 80A0202C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00400 80A02030 24180080 */ addiu $t8, $zero, 0x0080 ## $t8 = 00000080 -/* 00404 80A02034 18400004 */ blez $v0, .L80A02048 -/* 00408 80A02038 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0040C 80A0203C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00410 80A02040 10000013 */ beq $zero, $zero, .L80A02090 -/* 00414 80A02044 A60E02C0 */ sh $t6, 0x02C0($s0) ## 000002C0 -.L80A02048: -/* 00418 80A02048 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0041C 80A0204C A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 -/* 00420 80A02050 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00424 80A02054 A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 00428 80A02058 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0042C 80A0205C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 00430 80A02060 3C0180A0 */ lui $at, %hi(D_80A06178) ## $at = 80A00000 -/* 00434 80A02064 46080280 */ add.s $f10, $f0, $f8 -/* 00438 80A02068 E60A02B8 */ swc1 $f10, 0x02B8($s0) ## 000002B8 -/* 0043C 80A0206C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00440 80A02070 C42C6178 */ lwc1 $f12, %lo(D_80A06178)($at) -/* 00444 80A02074 4600040D */ trunc.w.s $f16, $f0 -/* 00448 80A02078 3C0980A0 */ lui $t1, %hi(func_80A0214C) ## $t1 = 80A00000 -/* 0044C 80A0207C 2529214C */ addiu $t1, $t1, %lo(func_80A0214C) ## $t1 = 80A0214C -/* 00450 80A02080 AE0902C8 */ sw $t1, 0x02C8($s0) ## 000002C8 -/* 00454 80A02084 44088000 */ mfc1 $t0, $f16 -/* 00458 80A02088 00000000 */ nop -/* 0045C 80A0208C A60802B0 */ sh $t0, 0x02B0($s0) ## 000002B0 -.L80A02090: -/* 00460 80A02090 8FBF001C */ lw $ra, 0x001C($sp) -/* 00464 80A02094 8FB00018 */ lw $s0, 0x0018($sp) -/* 00468 80A02098 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0046C 80A0209C 03E00008 */ jr $ra -/* 00470 80A020A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s deleted file mode 100644 index 4c89c80125..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s +++ /dev/null @@ -1,53 +0,0 @@ -.late_rodata -glabel D_80A0617C - .float 32767.0 - -.text -glabel func_80A020A4 -/* 00474 80A020A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00478 80A020A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0047C 80A020AC AFB00018 */ sw $s0, 0x0018($sp) -/* 00480 80A020B0 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00484 80A020B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00488 80A020B8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 0048C 80A020BC 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 00490 80A020C0 0C2807E4 */ jal func_80A01F90 -/* 00494 80A020C4 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 00498 80A020C8 5040001C */ beql $v0, $zero, .L80A0213C -/* 0049C 80A020CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 004A0 80A020D0 860202C0 */ lh $v0, 0x02C0($s0) ## 000002C0 -/* 004A4 80A020D4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 004A8 80A020D8 24180080 */ addiu $t8, $zero, 0x0080 ## $t8 = 00000080 -/* 004AC 80A020DC 18400004 */ blez $v0, .L80A020F0 -/* 004B0 80A020E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 004B4 80A020E4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 004B8 80A020E8 10000013 */ beq $zero, $zero, .L80A02138 -/* 004BC 80A020EC A60E02C0 */ sh $t6, 0x02C0($s0) ## 000002C0 -.L80A020F0: -/* 004C0 80A020F0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 004C4 80A020F4 A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 -/* 004C8 80A020F8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 004CC 80A020FC A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 004D0 80A02100 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 004D4 80A02104 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 004D8 80A02108 3C0180A0 */ lui $at, %hi(D_80A0617C) ## $at = 80A00000 -/* 004DC 80A0210C 46040180 */ add.s $f6, $f0, $f4 -/* 004E0 80A02110 E60602B8 */ swc1 $f6, 0x02B8($s0) ## 000002B8 -/* 004E4 80A02114 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 004E8 80A02118 C42C617C */ lwc1 $f12, %lo(D_80A0617C)($at) -/* 004EC 80A0211C 4600020D */ trunc.w.s $f8, $f0 -/* 004F0 80A02120 3C0980A0 */ lui $t1, %hi(func_80A0214C) ## $t1 = 80A00000 -/* 004F4 80A02124 2529214C */ addiu $t1, $t1, %lo(func_80A0214C) ## $t1 = 80A0214C -/* 004F8 80A02128 AE0902C8 */ sw $t1, 0x02C8($s0) ## 000002C8 -/* 004FC 80A0212C 44084000 */ mfc1 $t0, $f8 -/* 00500 80A02130 00000000 */ nop -/* 00504 80A02134 A60802B0 */ sh $t0, 0x02B0($s0) ## 000002B0 -.L80A02138: -/* 00508 80A02138 8FBF001C */ lw $ra, 0x001C($sp) -.L80A0213C: -/* 0050C 80A0213C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00510 80A02140 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00514 80A02144 03E00008 */ jr $ra -/* 00518 80A02148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s deleted file mode 100644 index 66b009a45e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s +++ /dev/null @@ -1,152 +0,0 @@ -.late_rodata -glabel D_80A06180 - .float 0.2 - -glabel D_80A06184 - .float 0.949999988079071 - -glabel D_80A06188 - .float 0.05 - -glabel D_80A0618C - .float 0.1 - -glabel D_80A06190 - .float 32767.0 - -.text -glabel func_80A0214C -/* 0051C 80A0214C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00520 80A02150 AFBF001C */ sw $ra, 0x001C($sp) -/* 00524 80A02154 AFB00018 */ sw $s0, 0x0018($sp) -/* 00528 80A02158 AFA5002C */ sw $a1, 0x002C($sp) -/* 0052C 80A0215C 848202C0 */ lh $v0, 0x02C0($a0) ## 000002C0 -/* 00530 80A02160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00534 80A02164 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00538 80A02168 18400003 */ blez $v0, .L80A02178 -/* 0053C 80A0216C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00540 80A02170 10000050 */ beq $zero, $zero, .L80A022B4 -/* 00544 80A02174 A48E02C0 */ sh $t6, 0x02C0($a0) ## 000002C0 -.L80A02178: -/* 00548 80A02178 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 0054C 80A0217C C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 -/* 00550 80A02180 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00554 80A02184 4600103C */ c.lt.s $f2, $f0 -/* 00558 80A02188 00000000 */ nop -/* 0055C 80A0218C 45020021 */ bc1fl .L80A02214 -/* 00560 80A02190 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 -/* 00564 80A02194 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00568 80A02198 00000000 */ nop -/* 0056C 80A0219C 3C0180A0 */ lui $at, %hi(D_80A06180) ## $at = 80A00000 -/* 00570 80A021A0 C4246180 */ lwc1 $f4, %lo(D_80A06180)($at) -/* 00574 80A021A4 3C1980A0 */ lui $t9, %hi(func_80A020A4) ## $t9 = 80A00000 -/* 00578 80A021A8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0057C 80A021AC 4604003C */ c.lt.s $f0, $f4 -/* 00580 80A021B0 24180400 */ addiu $t8, $zero, 0x0400 ## $t8 = 00000400 -/* 00584 80A021B4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00588 80A021B8 273920A4 */ addiu $t9, $t9, %lo(func_80A020A4) ## $t9 = 80A020A4 -/* 0058C 80A021BC 45000012 */ bc1f .L80A02208 -/* 00590 80A021C0 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00594 80A021C4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 00598 80A021C8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0059C 80A021CC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 -/* 005A0 80A021D0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 005A4 80A021D4 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 005A8 80A021D8 A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 -/* 005AC 80A021DC A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 005B0 80A021E0 AE1902C8 */ sw $t9, 0x02C8($s0) ## 000002C8 -/* 005B4 80A021E4 E60602B8 */ swc1 $f6, 0x02B8($s0) ## 000002B8 -/* 005B8 80A021E8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 005BC 80A021EC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 005C0 80A021F0 4600028D */ trunc.w.s $f10, $f0 -/* 005C4 80A021F4 440B5000 */ mfc1 $t3, $f10 -/* 005C8 80A021F8 00000000 */ nop -/* 005CC 80A021FC 256C0004 */ addiu $t4, $t3, 0x0004 ## $t4 = 00000004 -/* 005D0 80A02200 1000002C */ beq $zero, $zero, .L80A022B4 -/* 005D4 80A02204 A60C02C0 */ sh $t4, 0x02C0($s0) ## 000002C0 -.L80A02208: -/* 005D8 80A02208 1000002A */ beq $zero, $zero, .L80A022B4 -/* 005DC 80A0220C A60D02C0 */ sh $t5, 0x02C0($s0) ## 000002C0 -/* 005E0 80A02210 44816000 */ mtc1 $at, $f12 ## $f12 = 0.00 -.L80A02214: -/* 005E4 80A02214 3C0180A0 */ lui $at, %hi(D_80A06184) ## $at = 80A00000 -/* 005E8 80A02218 4602603C */ c.lt.s $f12, $f2 -/* 005EC 80A0221C 00000000 */ nop -/* 005F0 80A02220 45020003 */ bc1fl .L80A02230 -/* 005F4 80A02224 46001401 */ sub.s $f16, $f2, $f0 -/* 005F8 80A02228 46006086 */ mov.s $f2, $f12 -/* 005FC 80A0222C 46001401 */ sub.s $f16, $f2, $f0 -.L80A02230: -/* 00600 80A02230 C4326184 */ lwc1 $f18, %lo(D_80A06184)($at) -/* 00604 80A02234 3C0180A0 */ lui $at, %hi(D_80A06188) ## $at = 80A00000 -/* 00608 80A02238 C4266188 */ lwc1 $f6, %lo(D_80A06188)($at) -/* 0060C 80A0223C 46128102 */ mul.s $f4, $f16, $f18 -/* 00610 80A02240 46062080 */ add.s $f2, $f4, $f6 -/* 00614 80A02244 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00618 80A02248 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 0061C 80A0224C C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 00620 80A02250 3C1880A0 */ lui $t8, %hi(func_80A01FE0) ## $t8 = 80A00000 -/* 00624 80A02254 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00628 80A02258 4602003C */ c.lt.s $f0, $f2 -/* 0062C 80A0225C 240F0200 */ addiu $t7, $zero, 0x0200 ## $t7 = 00000200 -/* 00630 80A02260 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00634 80A02264 27181FE0 */ addiu $t8, $t8, %lo(func_80A01FE0) ## $t8 = 80A01FE0 -/* 00638 80A02268 45000011 */ bc1f .L80A022B0 -/* 0063C 80A0226C 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00640 80A02270 46021200 */ add.s $f8, $f2, $f2 -/* 00644 80A02274 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00648 80A02278 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 0064C 80A0227C 44816000 */ mtc1 $at, $f12 ## $f12 = 16.00 -/* 00650 80A02280 460A4400 */ add.s $f16, $f8, $f10 -/* 00654 80A02284 A60E02A8 */ sh $t6, 0x02A8($s0) ## 000002A8 -/* 00658 80A02288 A60F02AC */ sh $t7, 0x02AC($s0) ## 000002AC -/* 0065C 80A0228C AE1802C8 */ sw $t8, 0x02C8($s0) ## 000002C8 -/* 00660 80A02290 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00664 80A02294 E61002B8 */ swc1 $f16, 0x02B8($s0) ## 000002B8 -/* 00668 80A02298 4600048D */ trunc.w.s $f18, $f0 -/* 0066C 80A0229C 440A9000 */ mfc1 $t2, $f18 -/* 00670 80A022A0 00000000 */ nop -/* 00674 80A022A4 254B0010 */ addiu $t3, $t2, 0x0010 ## $t3 = 00000010 -/* 00678 80A022A8 10000002 */ beq $zero, $zero, .L80A022B4 -/* 0067C 80A022AC A60B02C0 */ sh $t3, 0x02C0($s0) ## 000002C0 -.L80A022B0: -/* 00680 80A022B0 A60C02C0 */ sh $t4, 0x02C0($s0) ## 000002C0 -.L80A022B4: -/* 00684 80A022B4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00688 80A022B8 00000000 */ nop -/* 0068C 80A022BC 3C0180A0 */ lui $at, %hi(D_80A0618C) ## $at = 80A00000 -/* 00690 80A022C0 C424618C */ lwc1 $f4, %lo(D_80A0618C)($at) -/* 00694 80A022C4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00698 80A022C8 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 0069C 80A022CC 4604003C */ c.lt.s $f0, $f4 -/* 006A0 80A022D0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 006A4 80A022D4 45020011 */ bc1fl .L80A0231C -/* 006A8 80A022D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 006AC 80A022DC 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 006B0 80A022E0 A60D02A8 */ sh $t5, 0x02A8($s0) ## 000002A8 -/* 006B4 80A022E4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 006B8 80A022E8 A60E02AC */ sh $t6, 0x02AC($s0) ## 000002AC -/* 006BC 80A022EC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 006C0 80A022F0 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 006C4 80A022F4 3C0180A0 */ lui $at, %hi(D_80A06190) ## $at = 80A00000 -/* 006C8 80A022F8 46060200 */ add.s $f8, $f0, $f6 -/* 006CC 80A022FC E60802B8 */ swc1 $f8, 0x02B8($s0) ## 000002B8 -/* 006D0 80A02300 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 006D4 80A02304 C42C6190 */ lwc1 $f12, %lo(D_80A06190)($at) -/* 006D8 80A02308 4600028D */ trunc.w.s $f10, $f0 -/* 006DC 80A0230C 44185000 */ mfc1 $t8, $f10 -/* 006E0 80A02310 00000000 */ nop -/* 006E4 80A02314 A61802B0 */ sh $t8, 0x02B0($s0) ## 000002B0 -/* 006E8 80A02318 8FBF001C */ lw $ra, 0x001C($sp) -.L80A0231C: -/* 006EC 80A0231C 8FB00018 */ lw $s0, 0x0018($sp) -/* 006F0 80A02320 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006F4 80A02324 03E00008 */ jr $ra -/* 006F8 80A02328 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s deleted file mode 100644 index 884209a795..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A0232C -/* 006FC 80A0232C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00700 80A02330 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00704 80A02334 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00708 80A02338 AFA5001C */ sw $a1, 0x001C($sp) -/* 0070C 80A0233C 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 -/* 00710 80A02340 AFA70018 */ sw $a3, 0x0018($sp) -/* 00714 80A02344 2484028C */ addiu $a0, $a0, 0x028C ## $a0 = 0000028C -/* 00718 80A02348 0C2807E4 */ jal func_80A01F90 -/* 0071C 80A0234C 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00720 80A02350 1040000B */ beq $v0, $zero, .L80A02380 -/* 00724 80A02354 8FA70018 */ lw $a3, 0x0018($sp) -/* 00728 80A02358 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0072C 80A0235C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 00730 80A02360 3C0F80A0 */ lui $t7, %hi(func_80A0214C) ## $t7 = 80A00000 -/* 00734 80A02364 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 -/* 00738 80A02368 25EF214C */ addiu $t7, $t7, %lo(func_80A0214C) ## $t7 = 80A0214C -/* 0073C 80A0236C A4E002A8 */ sh $zero, 0x02A8($a3) ## 000002A8 -/* 00740 80A02370 A4EE02AC */ sh $t6, 0x02AC($a3) ## 000002AC -/* 00744 80A02374 ACEF02C8 */ sw $t7, 0x02C8($a3) ## 000002C8 -/* 00748 80A02378 10000006 */ beq $zero, $zero, .L80A02394 -/* 0074C 80A0237C E4E402B8 */ swc1 $f4, 0x02B8($a3) ## 000002B8 -.L80A02380: -/* 00750 80A02380 8CF902C8 */ lw $t9, 0x02C8($a3) ## 000002C8 -/* 00754 80A02384 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00758 80A02388 8FA5001C */ lw $a1, 0x001C($sp) -/* 0075C 80A0238C 0320F809 */ jalr $ra, $t9 -/* 00760 80A02390 00000000 */ nop -.L80A02394: -/* 00764 80A02394 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00768 80A02398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0076C 80A0239C 03E00008 */ jr $ra -/* 00770 80A023A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s deleted file mode 100644 index bf071d5e12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A023A4 -/* 00774 80A023A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00778 80A023A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0077C 80A023AC 10810007 */ beq $a0, $at, .L80A023CC -/* 00780 80A023B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00784 80A023B4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00788 80A023B8 5081000D */ beql $a0, $at, .L80A023F0 -/* 0078C 80A023BC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00790 80A023C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00794 80A023C4 1000000F */ beq $zero, $zero, .L80A02404 -/* 00798 80A023C8 00000000 */ nop -.L80A023CC: -/* 0079C 80A023CC 3C01425C */ lui $at, 0x425C ## $at = 425C0000 -/* 007A0 80A023D0 44816000 */ mtc1 $at, $f12 ## $f12 = 55.00 -/* 007A4 80A023D4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 007A8 80A023D8 00000000 */ nop -/* 007AC 80A023DC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 007B0 80A023E0 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 007B4 80A023E4 10000007 */ beq $zero, $zero, .L80A02404 -/* 007B8 80A023E8 46040000 */ add.s $f0, $f0, $f4 -/* 007BC 80A023EC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L80A023F0: -/* 007C0 80A023F0 44816000 */ mtc1 $at, $f12 ## $f12 = 255.00 -/* 007C4 80A023F4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 007C8 80A023F8 00000000 */ nop -/* 007CC 80A023FC 10000002 */ beq $zero, $zero, .L80A02408 -/* 007D0 80A02400 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A02404: -/* 007D4 80A02404 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A02408: -/* 007D8 80A02408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007DC 80A0240C 03E00008 */ jr $ra -/* 007E0 80A02410 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s deleted file mode 100644 index 5cb201abdd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A0299C -/* 00D6C 80A0299C AFA40000 */ sw $a0, 0x0000($sp) -/* 00D70 80A029A0 03E00008 */ jr $ra -/* 00D74 80A029A4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s deleted file mode 100644 index 0bc0b997b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A029A8 -/* 00D78 80A029A8 AFA50004 */ sw $a1, 0x0004($sp) -/* 00D7C 80A029AC 848202C2 */ lh $v0, 0x02C2($a0) ## 000002C2 -/* 00D80 80A029B0 00052C00 */ sll $a1, $a1, 16 -/* 00D84 80A029B4 00052C03 */ sra $a1, $a1, 16 -/* 00D88 80A029B8 28410258 */ slti $at, $v0, 0x0258 -/* 00D8C 80A029BC 10200002 */ beq $at, $zero, .L80A029C8 -/* 00D90 80A029C0 00457021 */ addu $t6, $v0, $a1 -/* 00D94 80A029C4 A48E02C2 */ sh $t6, 0x02C2($a0) ## 000002C2 -.L80A029C8: -/* 00D98 80A029C8 03E00008 */ jr $ra -/* 00D9C 80A029CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s deleted file mode 100644 index f26a2c3d2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A02A20 -/* 00DF0 80A02A20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DF4 80A02A24 AFB00018 */ sw $s0, 0x0018($sp) -/* 00DF8 80A02A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DFC 80A02A2C AFBF001C */ sw $ra, 0x001C($sp) -/* 00E00 80A02A30 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E04 80A02A34 0C01DE1C */ jal Math_Sins - ## sins? -/* 00E08 80A02A38 848402AC */ lh $a0, 0x02AC($a0) ## 000002AC -/* 00E0C 80A02A3C C60402B8 */ lwc1 $f4, 0x02B8($s0) ## 000002B8 -/* 00E10 80A02A40 860402AA */ lh $a0, 0x02AA($s0) ## 000002AA -/* 00E14 80A02A44 46040182 */ mul.s $f6, $f0, $f4 -/* 00E18 80A02A48 0C01DE1C */ jal Math_Sins - ## sins? -/* 00E1C 80A02A4C E606028C */ swc1 $f6, 0x028C($s0) ## 0000028C -/* 00E20 80A02A50 C60802B4 */ lwc1 $f8, 0x02B4($s0) ## 000002B4 -/* 00E24 80A02A54 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 00E28 80A02A58 46080282 */ mul.s $f10, $f0, $f8 -/* 00E2C 80A02A5C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00E30 80A02A60 E60A0290 */ swc1 $f10, 0x0290($s0) ## 00000290 -/* 00E34 80A02A64 C61002B8 */ lwc1 $f16, 0x02B8($s0) ## 000002B8 -/* 00E38 80A02A68 860E02AC */ lh $t6, 0x02AC($s0) ## 000002AC -/* 00E3C 80A02A6C 860F02B0 */ lh $t7, 0x02B0($s0) ## 000002B0 -/* 00E40 80A02A70 46100482 */ mul.s $f18, $f0, $f16 -/* 00E44 80A02A74 861902AA */ lh $t9, 0x02AA($s0) ## 000002AA -/* 00E48 80A02A78 860802AE */ lh $t0, 0x02AE($s0) ## 000002AE -/* 00E4C 80A02A7C 01CFC021 */ addu $t8, $t6, $t7 -/* 00E50 80A02A80 A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 00E54 80A02A84 03284821 */ addu $t1, $t9, $t0 -/* 00E58 80A02A88 A60902AA */ sh $t1, 0x02AA($s0) ## 000002AA -/* 00E5C 80A02A8C E6120294 */ swc1 $f18, 0x0294($s0) ## 00000294 -/* 00E60 80A02A90 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E64 80A02A94 8FB00018 */ lw $s0, 0x0018($sp) -/* 00E68 80A02A98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E6C 80A02A9C 03E00008 */ jr $ra -/* 00E70 80A02AA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s deleted file mode 100644 index 859d2a9e33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A02AA4 -/* 00E74 80A02AA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E78 80A02AA8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E7C 80A02AAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E80 80A02AB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E84 80A02AB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00E88 80A02AB8 0C01DE0D */ jal Math_Coss - ## coss? -/* 00E8C 80A02ABC 848402AA */ lh $a0, 0x02AA($a0) ## 000002AA -/* 00E90 80A02AC0 C60402B4 */ lwc1 $f4, 0x02B4($s0) ## 000002B4 -/* 00E94 80A02AC4 C60802B8 */ lwc1 $f8, 0x02B8($s0) ## 000002B8 -/* 00E98 80A02AC8 46040182 */ mul.s $f6, $f0, $f4 -/* 00E9C 80A02ACC 46083280 */ add.s $f10, $f6, $f8 -/* 00EA0 80A02AD0 E7AA0024 */ swc1 $f10, 0x0024($sp) -/* 00EA4 80A02AD4 0C01DE1C */ jal Math_Sins - ## sins? -/* 00EA8 80A02AD8 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 00EAC 80A02ADC C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 00EB0 80A02AE0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00EB4 80A02AE4 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 00EB8 80A02AE8 46100482 */ mul.s $f18, $f0, $f16 -/* 00EBC 80A02AEC E6040290 */ swc1 $f4, 0x0290($s0) ## 00000290 -/* 00EC0 80A02AF0 0C01DE0D */ jal Math_Coss - ## coss? -/* 00EC4 80A02AF4 E612028C */ swc1 $f18, 0x028C($s0) ## 0000028C -/* 00EC8 80A02AF8 C7A60024 */ lwc1 $f6, 0x0024($sp) -/* 00ECC 80A02AFC 860E02AC */ lh $t6, 0x02AC($s0) ## 000002AC -/* 00ED0 80A02B00 860F02B0 */ lh $t7, 0x02B0($s0) ## 000002B0 -/* 00ED4 80A02B04 46060202 */ mul.s $f8, $f0, $f6 -/* 00ED8 80A02B08 861902AA */ lh $t9, 0x02AA($s0) ## 000002AA -/* 00EDC 80A02B0C 860802AE */ lh $t0, 0x02AE($s0) ## 000002AE -/* 00EE0 80A02B10 01CFC021 */ addu $t8, $t6, $t7 -/* 00EE4 80A02B14 A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 00EE8 80A02B18 03284821 */ addu $t1, $t9, $t0 -/* 00EEC 80A02B1C A60902AA */ sh $t1, 0x02AA($s0) ## 000002AA -/* 00EF0 80A02B20 E6080294 */ swc1 $f8, 0x0294($s0) ## 00000294 -/* 00EF4 80A02B24 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EF8 80A02B28 8FB00018 */ lw $s0, 0x0018($sp) -/* 00EFC 80A02B2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F00 80A02B30 03E00008 */ jr $ra -/* 00F04 80A02B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s deleted file mode 100644 index 50484070e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80A02B38 -/* 00F08 80A02B38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F0C 80A02B3C AFBF001C */ sw $ra, 0x001C($sp) -/* 00F10 80A02B40 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F14 80A02B44 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00F18 80A02B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F1C 80A02B4C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00F20 80A02B50 848402AC */ lh $a0, 0x02AC($a0) ## 000002AC -/* 00F24 80A02B54 0004C040 */ sll $t8, $a0, 1 -/* 00F28 80A02B58 0C01DE1C */ jal Math_Sins - ## sins? -/* 00F2C 80A02B5C A61802AA */ sh $t8, 0x02AA($s0) ## 000002AA -/* 00F30 80A02B60 C60402B8 */ lwc1 $f4, 0x02B8($s0) ## 000002B8 -/* 00F34 80A02B64 860402AA */ lh $a0, 0x02AA($s0) ## 000002AA -/* 00F38 80A02B68 46040182 */ mul.s $f6, $f0, $f4 -/* 00F3C 80A02B6C 0C01DE1C */ jal Math_Sins - ## sins? -/* 00F40 80A02B70 E606028C */ swc1 $f6, 0x028C($s0) ## 0000028C -/* 00F44 80A02B74 C60802B4 */ lwc1 $f8, 0x02B4($s0) ## 000002B4 -/* 00F48 80A02B78 46080282 */ mul.s $f10, $f0, $f8 -/* 00F4C 80A02B7C E60A0290 */ swc1 $f10, 0x0290($s0) ## 00000290 -/* 00F50 80A02B80 8FB90024 */ lw $t9, 0x0024($sp) -/* 00F54 80A02B84 0C01DE1C */ jal Math_Sins - ## sins? -/* 00F58 80A02B88 872400B6 */ lh $a0, 0x00B6($t9) ## 000000B6 -/* 00F5C 80A02B8C C612028C */ lwc1 $f18, 0x028C($s0) ## 0000028C -/* 00F60 80A02B90 46000407 */ neg.s $f16, $f0 -/* 00F64 80A02B94 46128102 */ mul.s $f4, $f16, $f18 -/* 00F68 80A02B98 E6040294 */ swc1 $f4, 0x0294($s0) ## 00000294 -/* 00F6C 80A02B9C 8FA80024 */ lw $t0, 0x0024($sp) -/* 00F70 80A02BA0 0C01DE0D */ jal Math_Coss - ## coss? -/* 00F74 80A02BA4 850400B6 */ lh $a0, 0x00B6($t0) ## 000000B6 -/* 00F78 80A02BA8 C606028C */ lwc1 $f6, 0x028C($s0) ## 0000028C -/* 00F7C 80A02BAC 860902AC */ lh $t1, 0x02AC($s0) ## 000002AC -/* 00F80 80A02BB0 860A02B0 */ lh $t2, 0x02B0($s0) ## 000002B0 -/* 00F84 80A02BB4 46060202 */ mul.s $f8, $f0, $f6 -/* 00F88 80A02BB8 012A5821 */ addu $t3, $t1, $t2 -/* 00F8C 80A02BBC A60B02AC */ sh $t3, 0x02AC($s0) ## 000002AC -/* 00F90 80A02BC0 E608028C */ swc1 $f8, 0x028C($s0) ## 0000028C -/* 00F94 80A02BC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F98 80A02BC8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F9C 80A02BCC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FA0 80A02BD0 03E00008 */ jr $ra -/* 00FA4 80A02BD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s deleted file mode 100644 index f391bba2cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80A02BD8 -/* 00FA8 80A02BD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FAC 80A02BDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FB0 80A02BE0 C4860290 */ lwc1 $f6, 0x0290($a0) ## 00000290 -/* 00FB4 80A02BE4 C4A40004 */ lwc1 $f4, 0x0004($a1) ## 00000004 -/* 00FB8 80A02BE8 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 00FBC 80A02BEC 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00FC0 80A02BF0 46062200 */ add.s $f8, $f4, $f6 -/* 00FC4 80A02BF4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00FC8 80A02BF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00FCC 80A02BFC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00FD0 80A02C00 460A4401 */ sub.s $f16, $f8, $f10 -/* 00FD4 80A02C04 460C8082 */ mul.s $f2, $f16, $f12 -/* 00FD8 80A02C08 4602703E */ c.le.s $f14, $f2 -/* 00FDC 80A02C0C 46001005 */ abs.s $f0, $f2 -/* 00FE0 80A02C10 45020006 */ bc1fl .L80A02C2C -/* 00FE4 80A02C14 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00FE8 80A02C18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00FEC 80A02C1C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00FF0 80A02C20 10000004 */ beq $zero, $zero, .L80A02C34 -/* 00FF4 80A02C24 460E003C */ c.lt.s $f0, $f14 -/* 00FF8 80A02C28 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -.L80A02C2C: -/* 00FFC 80A02C2C 00000000 */ nop -/* 01000 80A02C30 460E003C */ c.lt.s $f0, $f14 -.L80A02C34: -/* 01004 80A02C34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01008 80A02C38 45020004 */ bc1fl .L80A02C4C -/* 0100C 80A02C3C 44817000 */ mtc1 $at, $f14 ## $f14 = 20.00 -/* 01010 80A02C40 1000000B */ beq $zero, $zero, .L80A02C70 -/* 01014 80A02C44 46007006 */ mov.s $f0, $f14 -/* 01018 80A02C48 44817000 */ mtc1 $at, $f14 ## $f14 = 20.00 -.L80A02C4C: -/* 0101C 80A02C4C 00000000 */ nop -/* 01020 80A02C50 4600703C */ c.lt.s $f14, $f0 -/* 01024 80A02C54 00000000 */ nop -/* 01028 80A02C58 45020004 */ bc1fl .L80A02C6C -/* 0102C 80A02C5C 46000086 */ mov.s $f2, $f0 -/* 01030 80A02C60 10000002 */ beq $zero, $zero, .L80A02C6C -/* 01034 80A02C64 46007086 */ mov.s $f2, $f14 -/* 01038 80A02C68 46000086 */ mov.s $f2, $f0 -.L80A02C6C: -/* 0103C 80A02C6C 46001006 */ mov.s $f0, $f2 -.L80A02C70: -/* 01040 80A02C70 460C0482 */ mul.s $f18, $f0, $f12 -/* 01044 80A02C74 24E40060 */ addiu $a0, $a3, 0x0060 ## $a0 = 00000060 -/* 01048 80A02C78 3C064200 */ lui $a2, 0x4200 ## $a2 = 42000000 -/* 0104C 80A02C7C 44059000 */ mfc1 $a1, $f18 -/* 01050 80A02C80 0C01DE80 */ jal Math_ApproxF - -/* 01054 80A02C84 00000000 */ nop -/* 01058 80A02C88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0105C 80A02C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01060 80A02C90 03E00008 */ jr $ra -/* 01064 80A02C94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s deleted file mode 100644 index bf7fb0a524..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel func_80A02C98 -/* 01068 80A02C98 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0106C 80A02C9C AFBF001C */ sw $ra, 0x001C($sp) -/* 01070 80A02CA0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01074 80A02CA4 AFA60040 */ sw $a2, 0x0040($sp) -/* 01078 80A02CA8 C486028C */ lwc1 $f6, 0x028C($a0) ## 0000028C -/* 0107C 80A02CAC C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 01080 80A02CB0 C48A0024 */ lwc1 $f10, 0x0024($a0) ## 00000024 -/* 01084 80A02CB4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01088 80A02CB8 46062200 */ add.s $f8, $f4, $f6 -/* 0108C 80A02CBC C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 01090 80A02CC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01094 80A02CC4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01098 80A02CC8 460A4101 */ sub.s $f4, $f8, $f10 -/* 0109C 80A02CCC C48A0294 */ lwc1 $f10, 0x0294($a0) ## 00000294 -/* 010A0 80A02CD0 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 010A4 80A02CD4 46062382 */ mul.s $f14, $f4, $f6 -/* 010A8 80A02CD8 460A4100 */ add.s $f4, $f8, $f10 -/* 010AC 80A02CDC C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 010B0 80A02CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010B4 80A02CE4 46082281 */ sub.s $f10, $f4, $f8 -/* 010B8 80A02CE8 460E803E */ c.le.s $f16, $f14 -/* 010BC 80A02CEC 46065082 */ mul.s $f2, $f10, $f6 -/* 010C0 80A02CF0 46007005 */ abs.s $f0, $f14 -/* 010C4 80A02CF4 45000005 */ bc1f .L80A02D0C -/* 010C8 80A02CF8 46000386 */ mov.s $f14, $f0 -/* 010CC 80A02CFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 010D0 80A02D00 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 010D4 80A02D04 10000004 */ beq $zero, $zero, .L80A02D18 -/* 010D8 80A02D08 4602803E */ c.le.s $f16, $f2 -.L80A02D0C: -/* 010DC 80A02D0C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 010E0 80A02D10 00000000 */ nop -/* 010E4 80A02D14 4602803E */ c.le.s $f16, $f2 -.L80A02D18: -/* 010E8 80A02D18 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 010EC 80A02D1C 45020006 */ bc1fl .L80A02D38 -/* 010F0 80A02D20 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 010F4 80A02D24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 010F8 80A02D28 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 010FC 80A02D2C 10000004 */ beq $zero, $zero, .L80A02D40 -/* 01100 80A02D30 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 01104 80A02D34 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -.L80A02D38: -/* 01108 80A02D38 00000000 */ nop -/* 0110C 80A02D3C E7A80028 */ swc1 $f8, 0x0028($sp) -.L80A02D40: -/* 01110 80A02D40 4610703C */ c.lt.s $f14, $f16 -/* 01114 80A02D44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01118 80A02D48 46001005 */ abs.s $f0, $f2 -/* 0111C 80A02D4C 8FA60040 */ lw $a2, 0x0040($sp) -/* 01120 80A02D50 45020004 */ bc1fl .L80A02D64 -/* 01124 80A02D54 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01128 80A02D58 1000000C */ beq $zero, $zero, .L80A02D8C -/* 0112C 80A02D5C 46008086 */ mov.s $f2, $f16 -/* 01130 80A02D60 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -.L80A02D64: -/* 01134 80A02D64 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01138 80A02D68 460E503C */ c.lt.s $f10, $f14 -/* 0113C 80A02D6C 00000000 */ nop -/* 01140 80A02D70 45020005 */ bc1fl .L80A02D88 -/* 01144 80A02D74 46007306 */ mov.s $f12, $f14 -/* 01148 80A02D78 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0114C 80A02D7C 10000003 */ beq $zero, $zero, .L80A02D8C -/* 01150 80A02D80 46006086 */ mov.s $f2, $f12 -/* 01154 80A02D84 46007306 */ mov.s $f12, $f14 -.L80A02D88: -/* 01158 80A02D88 46006086 */ mov.s $f2, $f12 -.L80A02D8C: -/* 0115C 80A02D8C 4610003C */ c.lt.s $f0, $f16 -/* 01160 80A02D90 46121382 */ mul.s $f14, $f2, $f18 -/* 01164 80A02D94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01168 80A02D98 45020004 */ bc1fl .L80A02DAC -/* 0116C 80A02D9C 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 01170 80A02DA0 1000000B */ beq $zero, $zero, .L80A02DD0 -/* 01174 80A02DA4 46008086 */ mov.s $f2, $f16 -/* 01178 80A02DA8 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -.L80A02DAC: -/* 0117C 80A02DAC 00000000 */ nop -/* 01180 80A02DB0 4600103C */ c.lt.s $f2, $f0 -/* 01184 80A02DB4 00000000 */ nop -/* 01188 80A02DB8 45020004 */ bc1fl .L80A02DCC -/* 0118C 80A02DBC 46000306 */ mov.s $f12, $f0 -/* 01190 80A02DC0 10000002 */ beq $zero, $zero, .L80A02DCC -/* 01194 80A02DC4 46001306 */ mov.s $f12, $f2 -/* 01198 80A02DC8 46000306 */ mov.s $f12, $f0 -.L80A02DCC: -/* 0119C 80A02DCC 46006086 */ mov.s $f2, $f12 -.L80A02DD0: -/* 011A0 80A02DD0 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 011A4 80A02DD4 0C280AF6 */ jal func_80A02BD8 -/* 011A8 80A02DD8 E7AE0034 */ swc1 $f14, 0x0034($sp) -/* 011AC 80A02DDC C7AE0034 */ lwc1 $f14, 0x0034($sp) -/* 011B0 80A02DE0 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 011B4 80A02DE4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 011B8 80A02DE8 44057000 */ mfc1 $a1, $f14 -/* 011BC 80A02DEC 0C01DE80 */ jal Math_ApproxF - -/* 011C0 80A02DF0 00000000 */ nop -/* 011C4 80A02DF4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 011C8 80A02DF8 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 011CC 80A02DFC 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 -/* 011D0 80A02E00 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 011D4 80A02E04 46061102 */ mul.s $f4, $f2, $f6 -/* 011D8 80A02E08 44052000 */ mfc1 $a1, $f4 -/* 011DC 80A02E0C 0C01DE80 */ jal Math_ApproxF - -/* 011E0 80A02E10 00000000 */ nop -/* 011E4 80A02E14 0C00B5FB */ jal func_8002D7EC -/* 011E8 80A02E18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011EC 80A02E1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 011F0 80A02E20 8FB00018 */ lw $s0, 0x0018($sp) -/* 011F4 80A02E24 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 011F8 80A02E28 03E00008 */ jr $ra -/* 011FC 80A02E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s deleted file mode 100644 index ad2eb4e17a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A02E30 -/* 01200 80A02E30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01204 80A02E34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01208 80A02E38 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0120C 80A02E3C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01210 80A02E40 AFA40018 */ sw $a0, 0x0018($sp) -/* 01214 80A02E44 0C280AF6 */ jal func_80A02BD8 -/* 01218 80A02E48 AFA5001C */ sw $a1, 0x001C($sp) -/* 0121C 80A02E4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01220 80A02E50 8FA5001C */ lw $a1, 0x001C($sp) -/* 01224 80A02E54 C486028C */ lwc1 $f6, 0x028C($a0) ## 0000028C -/* 01228 80A02E58 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 0122C 80A02E5C C48A0024 */ lwc1 $f10, 0x0024($a0) ## 00000024 -/* 01230 80A02E60 46062200 */ add.s $f8, $f4, $f6 -/* 01234 80A02E64 C4840294 */ lwc1 $f4, 0x0294($a0) ## 00000294 -/* 01238 80A02E68 460A4401 */ sub.s $f16, $f8, $f10 -/* 0123C 80A02E6C C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 01240 80A02E70 E490005C */ swc1 $f16, 0x005C($a0) ## 0000005C -/* 01244 80A02E74 C4B20008 */ lwc1 $f18, 0x0008($a1) ## 00000008 -/* 01248 80A02E78 46049180 */ add.s $f6, $f18, $f4 -/* 0124C 80A02E7C 46083281 */ sub.s $f10, $f6, $f8 -/* 01250 80A02E80 0C00B5FB */ jal func_8002D7EC -/* 01254 80A02E84 E48A0064 */ swc1 $f10, 0x0064($a0) ## 00000064 -/* 01258 80A02E88 8FA40018 */ lw $a0, 0x0018($sp) -/* 0125C 80A02E8C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01260 80A02E90 C492028C */ lwc1 $f18, 0x028C($a0) ## 0000028C -/* 01264 80A02E94 C4B00000 */ lwc1 $f16, 0x0000($a1) ## 00000000 -/* 01268 80A02E98 C4880294 */ lwc1 $f8, 0x0294($a0) ## 00000294 -/* 0126C 80A02E9C 46128100 */ add.s $f4, $f16, $f18 -/* 01270 80A02EA0 E4840024 */ swc1 $f4, 0x0024($a0) ## 00000024 -/* 01274 80A02EA4 C4A60008 */ lwc1 $f6, 0x0008($a1) ## 00000008 -/* 01278 80A02EA8 46083280 */ add.s $f10, $f6, $f8 -/* 0127C 80A02EAC E48A002C */ swc1 $f10, 0x002C($a0) ## 0000002C -/* 01280 80A02EB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01284 80A02EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01288 80A02EB8 03E00008 */ jr $ra -/* 0128C 80A02EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s deleted file mode 100644 index e38ddaf1e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A02EC0 -/* 01290 80A02EC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01294 80A02EC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01298 80A02EC8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0129C 80A02ECC AFA5001C */ sw $a1, 0x001C($sp) -/* 012A0 80A02ED0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 012A4 80A02ED4 0C280AF6 */ jal func_80A02BD8 -/* 012A8 80A02ED8 AFA40018 */ sw $a0, 0x0018($sp) -/* 012AC 80A02EDC 8FA40018 */ lw $a0, 0x0018($sp) -/* 012B0 80A02EE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 012B4 80A02EE4 00000000 */ nop -/* 012B8 80A02EE8 E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 012BC 80A02EEC 0C00B5FB */ jal func_8002D7EC -/* 012C0 80A02EF0 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 012C4 80A02EF4 8FA2001C */ lw $v0, 0x001C($sp) -/* 012C8 80A02EF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 012CC 80A02EFC C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000000 -/* 012D0 80A02F00 C486028C */ lwc1 $f6, 0x028C($a0) ## 0000028C -/* 012D4 80A02F04 C4900294 */ lwc1 $f16, 0x0294($a0) ## 00000294 -/* 012D8 80A02F08 46062200 */ add.s $f8, $f4, $f6 -/* 012DC 80A02F0C E4880024 */ swc1 $f8, 0x0024($a0) ## 00000024 -/* 012E0 80A02F10 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 -/* 012E4 80A02F14 46105480 */ add.s $f18, $f10, $f16 -/* 012E8 80A02F18 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 012EC 80A02F1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012F0 80A02F20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012F4 80A02F24 03E00008 */ jr $ra -/* 012F8 80A02F28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s deleted file mode 100644 index f891a5ff4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s +++ /dev/null @@ -1,72 +0,0 @@ -.late_rodata -glabel D_80A061BC - .float 0.2 - -.text -glabel func_80A02F2C -/* 012FC 80A02F2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01300 80A02F30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01304 80A02F34 AFA5001C */ sw $a1, 0x001C($sp) -/* 01308 80A02F38 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0130C 80A02F3C 848402AA */ lh $a0, 0x02AA($a0) ## 000002AA -/* 01310 80A02F40 0C01DE1C */ jal Math_Sins - ## sins? -/* 01314 80A02F44 AFA70018 */ sw $a3, 0x0018($sp) -/* 01318 80A02F48 8FA70018 */ lw $a3, 0x0018($sp) -/* 0131C 80A02F4C 8FAE001C */ lw $t6, 0x001C($sp) -/* 01320 80A02F50 3C0180A0 */ lui $at, %hi(D_80A061BC) ## $at = 80A00000 -/* 01324 80A02F54 C4E402B4 */ lwc1 $f4, 0x02B4($a3) ## 000002B4 -/* 01328 80A02F58 C5C80004 */ lwc1 $f8, 0x0004($t6) ## 00000004 -/* 0132C 80A02F5C C4F00028 */ lwc1 $f16, 0x0028($a3) ## 00000028 -/* 01330 80A02F60 46040182 */ mul.s $f6, $f0, $f4 -/* 01334 80A02F64 C42461BC */ lwc1 $f4, %lo(D_80A061BC)($at) -/* 01338 80A02F68 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 0133C 80A02F6C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01340 80A02F70 46083280 */ add.s $f10, $f6, $f8 -/* 01344 80A02F74 46105481 */ sub.s $f18, $f10, $f16 -/* 01348 80A02F78 46049082 */ mul.s $f2, $f18, $f4 -/* 0134C 80A02F7C 4602703E */ c.le.s $f14, $f2 -/* 01350 80A02F80 46001005 */ abs.s $f0, $f2 -/* 01354 80A02F84 45020006 */ bc1fl .L80A02FA0 -/* 01358 80A02F88 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 0135C 80A02F8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01360 80A02F90 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01364 80A02F94 10000004 */ beq $zero, $zero, .L80A02FA8 -/* 01368 80A02F98 460E003C */ c.lt.s $f0, $f14 -/* 0136C 80A02F9C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -.L80A02FA0: -/* 01370 80A02FA0 00000000 */ nop -/* 01374 80A02FA4 460E003C */ c.lt.s $f0, $f14 -.L80A02FA8: -/* 01378 80A02FA8 84EF02AA */ lh $t7, 0x02AA($a3) ## 000002AA -/* 0137C 80A02FAC 84F802AE */ lh $t8, 0x02AE($a3) ## 000002AE -/* 01380 80A02FB0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01384 80A02FB4 01F8C821 */ addu $t9, $t7, $t8 -/* 01388 80A02FB8 45000003 */ bc1f .L80A02FC8 -/* 0138C 80A02FBC A4F902AA */ sh $t9, 0x02AA($a3) ## 000002AA -/* 01390 80A02FC0 1000000B */ beq $zero, $zero, .L80A02FF0 -/* 01394 80A02FC4 46007006 */ mov.s $f0, $f14 -.L80A02FC8: -/* 01398 80A02FC8 44817000 */ mtc1 $at, $f14 ## $f14 = 20.00 -/* 0139C 80A02FCC 00000000 */ nop -/* 013A0 80A02FD0 4600703C */ c.lt.s $f14, $f0 -/* 013A4 80A02FD4 00000000 */ nop -/* 013A8 80A02FD8 45020004 */ bc1fl .L80A02FEC -/* 013AC 80A02FDC 46000086 */ mov.s $f2, $f0 -/* 013B0 80A02FE0 10000002 */ beq $zero, $zero, .L80A02FEC -/* 013B4 80A02FE4 46007086 */ mov.s $f2, $f14 -/* 013B8 80A02FE8 46000086 */ mov.s $f2, $f0 -.L80A02FEC: -/* 013BC 80A02FEC 46001006 */ mov.s $f0, $f2 -.L80A02FF0: -/* 013C0 80A02FF0 460C0182 */ mul.s $f6, $f0, $f12 -/* 013C4 80A02FF4 24E40060 */ addiu $a0, $a3, 0x0060 ## $a0 = 00000060 -/* 013C8 80A02FF8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 013CC 80A02FFC 44053000 */ mfc1 $a1, $f6 -/* 013D0 80A03000 0C01DE80 */ jal Math_ApproxF - -/* 013D4 80A03004 00000000 */ nop -/* 013D8 80A03008 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013DC 80A0300C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013E0 80A03010 03E00008 */ jr $ra -/* 013E4 80A03014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s deleted file mode 100644 index d10c2c933d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s +++ /dev/null @@ -1,92 +0,0 @@ -.late_rodata -glabel D_80A061C0 - .float 0.01 - -.text -glabel func_80A03018 -/* 013E8 80A03018 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 013EC 80A0301C AFBF0024 */ sw $ra, 0x0024($sp) -/* 013F0 80A03020 AFB00020 */ sw $s0, 0x0020($sp) -/* 013F4 80A03024 AFA5003C */ sw $a1, 0x003C($sp) -/* 013F8 80A03028 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 013FC 80A0302C 3C0180A0 */ lui $at, %hi(D_80A061C0) ## $at = 80A00000 -/* 01400 80A03030 C42461C0 */ lwc1 $f4, %lo(D_80A061C0)($at) -/* 01404 80A03034 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01408 80A03038 8E0502B8 */ lw $a1, 0x02B8($s0) ## 000002B8 -/* 0140C 80A0303C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01410 80A03040 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01414 80A03044 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 01418 80A03048 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 0141C 80A0304C AFA3002C */ sw $v1, 0x002C($sp) -/* 01420 80A03050 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01424 80A03054 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01428 80A03058 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 0142C 80A0305C 8FA3002C */ lw $v1, 0x002C($sp) -/* 01430 80A03060 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01434 80A03064 50400008 */ beql $v0, $zero, .L80A03088 -/* 01438 80A03068 2602028C */ addiu $v0, $s0, 0x028C ## $v0 = 0000028C -/* 0143C 80A0306C 1041001E */ beq $v0, $at, .L80A030E8 -/* 01440 80A03070 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01444 80A03074 50410011 */ beql $v0, $at, .L80A030BC -/* 01448 80A03078 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 0144C 80A0307C 10000023 */ beq $zero, $zero, .L80A0310C -/* 01450 80A03080 860502B0 */ lh $a1, 0x02B0($s0) ## 000002B0 -/* 01454 80A03084 2602028C */ addiu $v0, $s0, 0x028C ## $v0 = 0000028C -.L80A03088: -/* 01458 80A03088 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000294 -/* 0145C 80A0308C C4500000 */ lwc1 $f16, 0x0000($v0) ## 0000028C -/* 01460 80A03090 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 01464 80A03094 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 01468 80A03098 46083301 */ sub.s $f12, $f6, $f8 -/* 0146C 80A0309C 46105381 */ sub.s $f14, $f10, $f16 -/* 01470 80A030A0 46006307 */ neg.s $f12, $f12 -/* 01474 80A030A4 0C034199 */ jal atan2s - -/* 01478 80A030A8 46007387 */ neg.s $f14, $f14 -/* 0147C 80A030AC 00022C00 */ sll $a1, $v0, 16 -/* 01480 80A030B0 10000016 */ beq $zero, $zero, .L80A0310C -/* 01484 80A030B4 00052C03 */ sra $a1, $a1, 16 -/* 01488 80A030B8 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -.L80A030BC: -/* 0148C 80A030BC C464002C */ lwc1 $f4, 0x002C($v1) ## 0000002C -/* 01490 80A030C0 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01494 80A030C4 C4680024 */ lwc1 $f8, 0x0024($v1) ## 00000024 -/* 01498 80A030C8 46049301 */ sub.s $f12, $f18, $f4 -/* 0149C 80A030CC 46083381 */ sub.s $f14, $f6, $f8 -/* 014A0 80A030D0 46006307 */ neg.s $f12, $f12 -/* 014A4 80A030D4 0C034199 */ jal atan2s - -/* 014A8 80A030D8 46007387 */ neg.s $f14, $f14 -/* 014AC 80A030DC 00022C00 */ sll $a1, $v0, 16 -/* 014B0 80A030E0 1000000A */ beq $zero, $zero, .L80A0310C -/* 014B4 80A030E4 00052C03 */ sra $a1, $a1, 16 -.L80A030E8: -/* 014B8 80A030E8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 014BC 80A030EC C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C -/* 014C0 80A030F0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 014C4 80A030F4 C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 -/* 014C8 80A030F8 46105301 */ sub.s $f12, $f10, $f16 -/* 014CC 80A030FC 0C034199 */ jal atan2s - -/* 014D0 80A03100 46049381 */ sub.s $f14, $f18, $f4 -/* 014D4 80A03104 00022C00 */ sll $a1, $v0, 16 -/* 014D8 80A03108 00052C03 */ sra $a1, $a1, 16 -.L80A0310C: -/* 014DC 80A0310C 860702AC */ lh $a3, 0x02AC($s0) ## 000002AC -/* 014E0 80A03110 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 014E4 80A03114 AFAF0010 */ sw $t7, 0x0010($sp) -/* 014E8 80A03118 260402BC */ addiu $a0, $s0, 0x02BC ## $a0 = 000002BC -/* 014EC 80A0311C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 014F0 80A03120 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 014F4 80A03124 861802BC */ lh $t8, 0x02BC($s0) ## 000002BC -/* 014F8 80A03128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014FC 80A0312C 0C00B638 */ jal Actor_MoveForward - -/* 01500 80A03130 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 01504 80A03134 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01508 80A03138 8FB00020 */ lw $s0, 0x0020($sp) -/* 0150C 80A0313C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01510 80A03140 03E00008 */ jr $ra -/* 01514 80A03144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s deleted file mode 100644 index 76f38d3726..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s +++ /dev/null @@ -1,200 +0,0 @@ -.late_rodata -glabel D_80A061C8 - .float 0.05 - -glabel D_80A061CC - .float 0.008 - -glabel D_80A061D0 - .float 0.1 - -.text -glabel func_80A0329C -/* 0166C 80A0329C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01670 80A032A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01674 80A032A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01678 80A032A8 AFA5003C */ sw $a1, 0x003C($sp) -/* 0167C 80A032AC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01680 80A032B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01684 80A032B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01688 80A032B8 AFA20034 */ sw $v0, 0x0034($sp) -/* 0168C 80A032BC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01690 80A032C0 AFA2002C */ sw $v0, 0x002C($sp) -/* 01694 80A032C4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01698 80A032C8 00000000 */ nop -/* 0169C 80A032CC 3C0180A0 */ lui $at, %hi(D_80A061C8) ## $at = 80A00000 -/* 016A0 80A032D0 C42461C8 */ lwc1 $f4, %lo(D_80A061C8)($at) -/* 016A4 80A032D4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 016A8 80A032D8 4604003C */ c.lt.s $f0, $f4 -/* 016AC 80A032DC 00000000 */ nop -/* 016B0 80A032E0 45020011 */ bc1fl .L80A03328 -/* 016B4 80A032E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B8 80A032E8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 016BC 80A032EC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 016C0 80A032F0 00000000 */ nop -/* 016C4 80A032F4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 016C8 80A032F8 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 016CC 80A032FC 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 016D0 80A03300 44816000 */ mtc1 $at, $f12 ## $f12 = 1024.00 -/* 016D4 80A03304 46060200 */ add.s $f8, $f0, $f6 -/* 016D8 80A03308 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 016DC 80A0330C E60802B4 */ swc1 $f8, 0x02B4($s0) ## 000002B4 -/* 016E0 80A03310 4600028D */ trunc.w.s $f10, $f0 -/* 016E4 80A03314 44085000 */ mfc1 $t0, $f10 -/* 016E8 80A03318 00000000 */ nop -/* 016EC 80A0331C 25090200 */ addiu $t1, $t0, 0x0200 ## $t1 = 00000200 -/* 016F0 80A03320 A60902AE */ sh $t1, 0x02AE($s0) ## 000002AE -/* 016F4 80A03324 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A03328: -/* 016F8 80A03328 0C2808CB */ jal func_80A0232C -/* 016FC 80A0332C 8FA5003C */ lw $a1, 0x003C($sp) -/* 01700 80A03330 8FAA002C */ lw $t2, 0x002C($sp) -/* 01704 80A03334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01708 80A03338 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C -/* 0170C 80A0333C C550090C */ lwc1 $f16, 0x090C($t2) ## 0000090C -/* 01710 80A03340 0C280BCB */ jal func_80A02F2C -/* 01714 80A03344 E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 01718 80A03348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0171C 80A0334C 0C280C06 */ jal func_80A03018 -/* 01720 80A03350 8FA5003C */ lw $a1, 0x003C($sp) -/* 01724 80A03354 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 01728 80A03358 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0172C 80A0335C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01730 80A03360 10410004 */ beq $v0, $at, .L80A03374 -/* 01734 80A03364 8FA5003C */ lw $a1, 0x003C($sp) -/* 01738 80A03368 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0173C 80A0336C 54410004 */ bnel $v0, $at, .L80A03380 -/* 01740 80A03370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A03374: -/* 01744 80A03374 0C28126D */ jal func_80A049B4 -/* 01748 80A03378 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 0174C 80A0337C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A03380: -/* 01750 80A03380 0C00BD04 */ jal Actor_HasParent -/* 01754 80A03384 8FA5003C */ lw $a1, 0x003C($sp) -/* 01758 80A03388 10400005 */ beq $v0, $zero, .L80A033A0 -/* 0175C 80A0338C 00000000 */ nop -/* 01760 80A03390 0C00B55C */ jal Actor_Kill - -/* 01764 80A03394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01768 80A03398 10000064 */ beq $zero, $zero, .L80A0352C -/* 0176C 80A0339C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A033A0: -/* 01770 80A033A0 0C023A62 */ jal Player_InCsMode -/* 01774 80A033A4 8FA4003C */ lw $a0, 0x003C($sp) -/* 01778 80A033A8 54400060 */ bnel $v0, $zero, .L80A0352C -/* 0177C 80A033AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01780 80A033B0 8FA20034 */ lw $v0, 0x0034($sp) -/* 01784 80A033B4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 01788 80A033B8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0178C 80A033BC C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 01790 80A033C0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01794 80A033C4 46049001 */ sub.s $f0, $f18, $f4 -/* 01798 80A033C8 4600303C */ c.lt.s $f6, $f0 -/* 0179C 80A033CC 00000000 */ nop -/* 017A0 80A033D0 45020029 */ bc1fl .L80A03478 -/* 017A4 80A033D4 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 017A8 80A033D8 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 017AC 80A033DC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 017B0 80A033E0 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 017B4 80A033E4 4608003C */ c.lt.s $f0, $f8 -/* 017B8 80A033E8 00000000 */ nop -/* 017BC 80A033EC 45020022 */ bc1fl .L80A03478 -/* 017C0 80A033F0 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 017C4 80A033F4 0C2807E4 */ jal func_80A01F90 -/* 017C8 80A033F8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 017CC 80A033FC 1440001D */ bne $v0, $zero, .L80A03474 -/* 017D0 80A03400 8FA4003C */ lw $a0, 0x003C($sp) -/* 017D4 80A03404 0C021C5D */ jal Health_ChangeBy -/* 017D8 80A03408 24050080 */ addiu $a1, $zero, 0x0080 ## $a1 = 00000080 -/* 017DC 80A0340C 960B02C4 */ lhu $t3, 0x02C4($s0) ## 000002C4 -/* 017E0 80A03410 316C0200 */ andi $t4, $t3, 0x0200 ## $t4 = 00000000 -/* 017E4 80A03414 51800004 */ beql $t4, $zero, .L80A03428 -/* 017E8 80A03418 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 017EC 80A0341C 0C021DA0 */ jal func_80087680 -/* 017F0 80A03420 8FA4003C */ lw $a0, 0x003C($sp) -/* 017F4 80A03424 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -.L80A03428: -/* 017F8 80A03428 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 017FC 80A0342C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01800 80A03430 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 01804 80A03434 E60A02B8 */ swc1 $f10, 0x02B8($s0) ## 000002B8 -/* 01808 80A03438 8FAD0034 */ lw $t5, 0x0034($sp) -/* 0180C 80A0343C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01810 80A03440 240FF000 */ addiu $t7, $zero, 0xF000 ## $t7 = FFFFF000 -/* 01814 80A03444 85AE00B6 */ lh $t6, 0x00B6($t5) ## 000000B6 -/* 01818 80A03448 3C0580A0 */ lui $a1, %hi(func_80A03610) ## $a1 = 80A00000 -/* 0181C 80A0344C A60F02B0 */ sh $t7, 0x02B0($s0) ## 000002B0 -/* 01820 80A03450 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 01824 80A03454 24A53610 */ addiu $a1, $a1, %lo(func_80A03610) ## $a1 = 80A03610 -/* 01828 80A03458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0182C 80A0345C E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 01830 80A03460 E61202B4 */ swc1 $f18, 0x02B4($s0) ## 000002B4 -/* 01834 80A03464 0C28070C */ jal func_80A01C30 -/* 01838 80A03468 A60E02AC */ sh $t6, 0x02AC($s0) ## 000002AC -/* 0183C 80A0346C 1000002F */ beq $zero, $zero, .L80A0352C -/* 01840 80A03470 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A03474: -/* 01844 80A03474 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A03478: -/* 01848 80A03478 30780100 */ andi $t8, $v1, 0x0100 ## $t8 = 00000000 -/* 0184C 80A0347C 53000021 */ beql $t8, $zero, .L80A03504 -/* 01850 80A03480 306A0200 */ andi $t2, $v1, 0x0200 ## $t2 = 00000000 -/* 01854 80A03484 860202C2 */ lh $v0, 0x02C2($s0) ## 000002C2 -/* 01858 80A03488 18400005 */ blez $v0, .L80A034A0 -/* 0185C 80A0348C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 01860 80A03490 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 01864 80A03494 A61902C2 */ sh $t9, 0x02C2($s0) ## 000002C2 -/* 01868 80A03498 10000019 */ beq $zero, $zero, .L80A03500 -/* 0186C 80A0349C 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A034A0: -/* 01870 80A034A0 A60802C2 */ sh $t0, 0x02C2($s0) ## 000002C2 -/* 01874 80A034A4 860202C2 */ lh $v0, 0x02C2($s0) ## 000002C2 -/* 01878 80A034A8 2841FFF7 */ slti $at, $v0, 0xFFF7 -/* 0187C 80A034AC 14200010 */ bne $at, $zero, .L80A034F0 -/* 01880 80A034B0 2449000A */ addiu $t1, $v0, 0x000A ## $t1 = 0000000A -/* 01884 80A034B4 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 01888 80A034B8 3C0180A0 */ lui $at, %hi(D_80A061CC) ## $at = 80A00000 -/* 0188C 80A034BC C42861CC */ lwc1 $f8, %lo(D_80A061CC)($at) -/* 01890 80A034C0 468021A0 */ cvt.s.w $f6, $f4 -/* 01894 80A034C4 3C0180A0 */ lui $at, %hi(D_80A061D0) ## $at = 80A00000 -/* 01898 80A034C8 C43061D0 */ lwc1 $f16, %lo(D_80A061D0)($at) -/* 0189C 80A034CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A0 80A034D0 46083282 */ mul.s $f10, $f6, $f8 -/* 018A4 80A034D4 00000000 */ nop -/* 018A8 80A034D8 46105482 */ mul.s $f18, $f10, $f16 -/* 018AC 80A034DC 44059000 */ mfc1 $a1, $f18 -/* 018B0 80A034E0 0C00B58B */ jal Actor_SetScale - -/* 018B4 80A034E4 00000000 */ nop -/* 018B8 80A034E8 10000005 */ beq $zero, $zero, .L80A03500 -/* 018BC 80A034EC 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A034F0: -/* 018C0 80A034F0 0C00B55C */ jal Actor_Kill - -/* 018C4 80A034F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C8 80A034F8 1000000C */ beq $zero, $zero, .L80A0352C -/* 018CC 80A034FC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A03500: -/* 018D0 80A03500 306A0200 */ andi $t2, $v1, 0x0200 ## $t2 = 00000000 -.L80A03504: -/* 018D4 80A03504 15400008 */ bne $t2, $zero, .L80A03528 -/* 018D8 80A03508 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018DC 80A0350C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 018E0 80A03510 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 018E4 80A03514 8FA5003C */ lw $a1, 0x003C($sp) -/* 018E8 80A03518 2406007E */ addiu $a2, $zero, 0x007E ## $a2 = 0000007E -/* 018EC 80A0351C 3C0742A0 */ lui $a3, 0x42A0 ## $a3 = 42A00000 -/* 018F0 80A03520 0C00BD0D */ jal func_8002F434 -/* 018F4 80A03524 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80A03528: -/* 018F8 80A03528 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A0352C: -/* 018FC 80A0352C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01900 80A03530 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01904 80A03534 03E00008 */ jr $ra -/* 01908 80A03538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s deleted file mode 100644 index f4c7ac60af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80A061D4 - .float 1500.0 - -.text -glabel func_80A0353C -/* 0190C 80A0353C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01910 80A03540 AFB00018 */ sw $s0, 0x0018($sp) -/* 01914 80A03544 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01918 80A03548 AFBF001C */ sw $ra, 0x001C($sp) -/* 0191C 80A0354C AFA5003C */ sw $a1, 0x003C($sp) -/* 01920 80A03550 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01924 80A03554 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01928 80A03558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0192C 80A0355C 0C280A88 */ jal func_80A02A20 -/* 01930 80A03560 8FA5003C */ lw $a1, 0x003C($sp) -/* 01934 80A03564 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -/* 01938 80A03568 1060001B */ beq $v1, $zero, .L80A035D8 -/* 0193C 80A0356C 00000000 */ nop -/* 01940 80A03570 8C6E0130 */ lw $t6, 0x0130($v1) ## 00000130 -/* 01944 80A03574 11C00018 */ beq $t6, $zero, .L80A035D8 -/* 01948 80A03578 00000000 */ nop -/* 0194C 80A0357C 8C780024 */ lw $t8, 0x0024($v1) ## 00000024 -/* 01950 80A03580 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 01954 80A03584 3C0180A0 */ lui $at, %hi(D_80A061D4) ## $at = 80A00000 -/* 01958 80A03588 ACB80000 */ sw $t8, 0x0000($a1) ## FFFFFFF4 -/* 0195C 80A0358C 8C6F0028 */ lw $t7, 0x0028($v1) ## 00000028 -/* 01960 80A03590 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01964 80A03594 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01968 80A03598 ACAF0004 */ sw $t7, 0x0004($a1) ## FFFFFFF8 -/* 0196C 80A0359C 8C78002C */ lw $t8, 0x002C($v1) ## 0000002C -/* 01970 80A035A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01974 80A035A4 ACB80008 */ sw $t8, 0x0008($a1) ## FFFFFFFC -/* 01978 80A035A8 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 0197C 80A035AC C42461D4 */ lwc1 $f4, %lo(D_80A061D4)($at) -/* 01980 80A035B0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01984 80A035B4 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 01988 80A035B8 46062202 */ mul.s $f8, $f4, $f6 -/* 0198C 80A035BC C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 01990 80A035C0 460A4400 */ add.s $f16, $f8, $f10 -/* 01994 80A035C4 46109100 */ add.s $f4, $f18, $f16 -/* 01998 80A035C8 0C280B26 */ jal func_80A02C98 -/* 0199C 80A035CC E7A40030 */ swc1 $f4, 0x0030($sp) -/* 019A0 80A035D0 10000004 */ beq $zero, $zero, .L80A035E4 -/* 019A4 80A035D4 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -.L80A035D8: -/* 019A8 80A035D8 0C00B55C */ jal Actor_Kill - -/* 019AC 80A035DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019B0 80A035E0 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -.L80A035E4: -/* 019B4 80A035E4 0C034199 */ jal atan2s - -/* 019B8 80A035E8 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 019BC 80A035EC A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 019C0 80A035F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 019C4 80A035F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 019C8 80A035F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 019CC 80A035FC 03E00008 */ jr $ra -/* 019D0 80A03600 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s deleted file mode 100644 index ea33693541..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A03604 -/* 019D4 80A03604 AFA40000 */ sw $a0, 0x0000($sp) -/* 019D8 80A03608 03E00008 */ jr $ra -/* 019DC 80A0360C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s deleted file mode 100644 index 4a37438deb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s +++ /dev/null @@ -1,159 +0,0 @@ -.late_rodata -glabel D_80A061D8 - .float 0.1 - -glabel D_80A061DC - .float 0.2 - -glabel D_80A061E0 - .float 0.008 - -glabel D_80A061E4 - .float 0.05 - -.text -glabel func_80A03610 -/* 019E0 80A03610 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 019E4 80A03614 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019E8 80A03618 AFB00020 */ sw $s0, 0x0020($sp) -/* 019EC 80A0361C AFA50034 */ sw $a1, 0x0034($sp) -/* 019F0 80A03620 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 019F4 80A03624 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 019F8 80A03628 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 019FC 80A0362C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A00 80A03630 AFAF002C */ sw $t7, 0x002C($sp) -/* 01A04 80A03634 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01A08 80A03638 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01A0C 80A0363C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01A10 80A03640 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01A14 80A03644 260402B8 */ addiu $a0, $s0, 0x02B8 ## $a0 = 000002B8 -/* 01A18 80A03648 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 01A1C 80A0364C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 01A20 80A03650 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01A24 80A03654 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01A28 80A03658 0C01DE0D */ jal Math_Coss - ## coss? -/* 01A2C 80A0365C 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01A30 80A03660 C60602B8 */ lwc1 $f6, 0x02B8($s0) ## 000002B8 -/* 01A34 80A03664 C60202B4 */ lwc1 $f2, 0x02B4($s0) ## 000002B4 -/* 01A38 80A03668 C60A0290 */ lwc1 $f10, 0x0290($s0) ## 00000290 -/* 01A3C 80A0366C 46060202 */ mul.s $f8, $f0, $f6 -/* 01A40 80A03670 860302AA */ lh $v1, 0x02AA($s0) ## 000002AA -/* 01A44 80A03674 46025400 */ add.s $f16, $f10, $f2 -/* 01A48 80A03678 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01A4C 80A0367C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 01A50 80A03680 E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 01A54 80A03684 10600006 */ beq $v1, $zero, .L80A036A0 -/* 01A58 80A03688 E608028C */ swc1 $f8, 0x028C($s0) ## 0000028C -/* 01A5C 80A0368C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A60 80A03690 50410011 */ beql $v0, $at, .L80A036D8 -/* 01A64 80A03694 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01A68 80A03698 10000018 */ beq $zero, $zero, .L80A036FC -/* 01A6C 80A0369C 00000000 */ nop -.L80A036A0: -/* 01A70 80A036A0 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 01A74 80A036A4 3C0180A0 */ lui $at, %hi(D_80A061D8) ## $at = 80A00000 -/* 01A78 80A036A8 24780001 */ addiu $t8, $v1, 0x0001 ## $t8 = 00000001 -/* 01A7C 80A036AC 4612103C */ c.lt.s $f2, $f18 -/* 01A80 80A036B0 00000000 */ nop -/* 01A84 80A036B4 45000005 */ bc1f .L80A036CC -/* 01A88 80A036B8 00000000 */ nop -/* 01A8C 80A036BC C42461D8 */ lwc1 $f4, %lo(D_80A061D8)($at) -/* 01A90 80A036C0 46041180 */ add.s $f6, $f2, $f4 -/* 01A94 80A036C4 1000000D */ beq $zero, $zero, .L80A036FC -/* 01A98 80A036C8 E60602B4 */ swc1 $f6, 0x02B4($s0) ## 000002B4 -.L80A036CC: -/* 01A9C 80A036CC 1000000B */ beq $zero, $zero, .L80A036FC -/* 01AA0 80A036D0 A61802AA */ sh $t8, 0x02AA($s0) ## 000002AA -/* 01AA4 80A036D4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -.L80A036D8: -/* 01AA8 80A036D8 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 01AAC 80A036DC 3C0180A0 */ lui $at, %hi(D_80A061DC) ## $at = 80A00000 -/* 01AB0 80A036E0 4602403C */ c.lt.s $f8, $f2 -/* 01AB4 80A036E4 00000000 */ nop -/* 01AB8 80A036E8 45000004 */ bc1f .L80A036FC -/* 01ABC 80A036EC 00000000 */ nop -/* 01AC0 80A036F0 C42A61DC */ lwc1 $f10, %lo(D_80A061DC)($at) -/* 01AC4 80A036F4 460A1401 */ sub.s $f16, $f2, $f10 -/* 01AC8 80A036F8 E61002B4 */ swc1 $f16, 0x02B4($s0) ## 000002B4 -.L80A036FC: -/* 01ACC 80A036FC 0C01DE1C */ jal Math_Sins - ## sins? -/* 01AD0 80A03700 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01AD4 80A03704 C61202B8 */ lwc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01AD8 80A03708 861902AC */ lh $t9, 0x02AC($s0) ## 000002AC -/* 01ADC 80A0370C 860802B0 */ lh $t0, 0x02B0($s0) ## 000002B0 -/* 01AE0 80A03710 46009107 */ neg.s $f4, $f18 -/* 01AE4 80A03714 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01AE8 80A03718 46040182 */ mul.s $f6, $f0, $f4 -/* 01AEC 80A0371C 03284821 */ addu $t1, $t9, $t0 -/* 01AF0 80A03720 A60902AC */ sh $t1, 0x02AC($s0) ## 000002AC -/* 01AF4 80A03724 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01AF8 80A03728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AFC 80A0372C E6060294 */ swc1 $f6, 0x0294($s0) ## 00000294 -/* 01B00 80A03730 8FA5002C */ lw $a1, 0x002C($sp) -/* 01B04 80A03734 0C280B26 */ jal func_80A02C98 -/* 01B08 80A03738 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 01B0C 80A0373C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01B10 80A03740 C60802B4 */ lwc1 $f8, 0x02B4($s0) ## 000002B4 -/* 01B14 80A03744 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01B18 80A03748 4602403C */ c.lt.s $f8, $f2 -/* 01B1C 80A0374C 00000000 */ nop -/* 01B20 80A03750 45020016 */ bc1fl .L80A037AC -/* 01B24 80A03754 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B28 80A03758 C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -/* 01B2C 80A0375C 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 01B30 80A03760 00000000 */ nop -/* 01B34 80A03764 460A003C */ c.lt.s $f0, $f10 -/* 01B38 80A03768 00000000 */ nop -/* 01B3C 80A0376C 4502000F */ bc1fl .L80A037AC -/* 01B40 80A03770 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B44 80A03774 4600103C */ c.lt.s $f2, $f0 -/* 01B48 80A03778 3C0180A0 */ lui $at, %hi(D_80A061E0) ## $at = 80A00000 -/* 01B4C 80A0377C 4502000B */ bc1fl .L80A037AC -/* 01B50 80A03780 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B54 80A03784 C43061E0 */ lwc1 $f16, %lo(D_80A061E0)($at) -/* 01B58 80A03788 3C0180A0 */ lui $at, %hi(D_80A061E4) ## $at = 80A00000 -/* 01B5C 80A0378C C42461E4 */ lwc1 $f4, %lo(D_80A061E4)($at) -/* 01B60 80A03790 46100482 */ mul.s $f18, $f0, $f16 -/* 01B64 80A03794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B68 80A03798 46049182 */ mul.s $f6, $f18, $f4 -/* 01B6C 80A0379C 44053000 */ mfc1 $a1, $f6 -/* 01B70 80A037A0 0C00B58B */ jal Actor_SetScale - -/* 01B74 80A037A4 00000000 */ nop -/* 01B78 80A037A8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -.L80A037AC: -/* 01B7C 80A037AC 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 01B80 80A037B0 C6080290 */ lwc1 $f8, 0x0290($s0) ## 00000290 -/* 01B84 80A037B4 460A403C */ c.lt.s $f8, $f10 -/* 01B88 80A037B8 00000000 */ nop -/* 01B8C 80A037BC 45020006 */ bc1fl .L80A037D8 -/* 01B90 80A037C0 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 01B94 80A037C4 0C00B55C */ jal Actor_Kill - -/* 01B98 80A037C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B9C 80A037CC 1000000D */ beq $zero, $zero, .L80A03804 -/* 01BA0 80A037D0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01BA4 80A037D4 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -.L80A037D8: -/* 01BA8 80A037D8 0C034199 */ jal atan2s - -/* 01BAC 80A037DC C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 01BB0 80A037E0 A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 01BB4 80A037E4 8FA50034 */ lw $a1, 0x0034($sp) -/* 01BB8 80A037E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BBC 80A037EC 0C28126D */ jal func_80A049B4 -/* 01BC0 80A037F0 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 01BC4 80A037F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BC8 80A037F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01BCC 80A037FC 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 01BD0 80A03800 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A03804: -/* 01BD4 80A03804 8FB00020 */ lw $s0, 0x0020($sp) -/* 01BD8 80A03808 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01BDC 80A0380C 03E00008 */ jr $ra -/* 01BE0 80A03810 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s deleted file mode 100644 index 5a8f734e3a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s +++ /dev/null @@ -1,115 +0,0 @@ -.late_rodata -glabel D_80A061E8 - .float 0.1 - -glabel D_80A061EC - .float 0.7 - -.text -glabel func_80A03814 -/* 01BE4 80A03814 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01BE8 80A03818 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BEC 80A0381C AFB00018 */ sw $s0, 0x0018($sp) -/* 01BF0 80A03820 AFA5002C */ sw $a1, 0x002C($sp) -/* 01BF4 80A03824 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01BF8 80A03828 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BFC 80A0382C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C00 80A03830 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01C04 80A03834 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01C08 80A03838 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01C0C 80A0383C 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 01C10 80A03840 C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -/* 01C14 80A03844 4600203C */ c.lt.s $f4, $f0 -/* 01C18 80A03848 00000000 */ nop -/* 01C1C 80A0384C 45020006 */ bc1fl .L80A03868 -/* 01C20 80A03850 860202AE */ lh $v0, 0x02AE($s0) ## 000002AE -/* 01C24 80A03854 0C00B55C */ jal Actor_Kill - -/* 01C28 80A03858 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C2C 80A0385C 10000048 */ beq $zero, $zero, .L80A03980 -/* 01C30 80A03860 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C34 80A03864 860202AE */ lh $v0, 0x02AE($s0) ## 000002AE -.L80A03868: -/* 01C38 80A03868 2841007E */ slti $at, $v0, 0x007E -/* 01C3C 80A0386C 1420000E */ bne $at, $zero, .L80A038A8 -/* 01C40 80A03870 3C0180A0 */ lui $at, %hi(D_80A061E8) ## $at = 80A00000 -/* 01C44 80A03874 C42861E8 */ lwc1 $f8, %lo(D_80A061E8)($at) -/* 01C48 80A03878 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C4C 80A0387C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 01C50 80A03880 C61002B4 */ lwc1 $f16, 0x02B4($s0) ## 000002B4 -/* 01C54 80A03884 C60602B8 */ lwc1 $f6, 0x02B8($s0) ## 000002B8 -/* 01C58 80A03888 46128100 */ add.s $f4, $f16, $f18 -/* 01C5C 80A0388C 46083280 */ add.s $f10, $f6, $f8 -/* 01C60 80A03890 E60402B4 */ swc1 $f4, 0x02B4($s0) ## 000002B4 -/* 01C64 80A03894 C60602B4 */ lwc1 $f6, 0x02B4($s0) ## 000002B4 -/* 01C68 80A03898 E60A02B8 */ swc1 $f10, 0x02B8($s0) ## 000002B8 -/* 01C6C 80A0389C 46060200 */ add.s $f8, $f0, $f6 -/* 01C70 80A038A0 10000018 */ beq $zero, $zero, .L80A03904 -/* 01C74 80A038A4 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 -.L80A038A8: -/* 01C78 80A038A8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01C7C 80A038AC 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 01C80 80A038B0 C60002B8 */ lwc1 $f0, 0x02B8($s0) ## 000002B8 -/* 01C84 80A038B4 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 01C88 80A038B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01C8C 80A038BC 460A003C */ c.lt.s $f0, $f10 -/* 01C90 80A038C0 A61802AE */ sh $t8, 0x02AE($s0) ## 000002AE -/* 01C94 80A038C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C98 80A038C8 45020006 */ bc1fl .L80A038E4 -/* 01C9C 80A038CC C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -/* 01CA0 80A038D0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 01CA4 80A038D4 00000000 */ nop -/* 01CA8 80A038D8 46100480 */ add.s $f18, $f0, $f16 -/* 01CAC 80A038DC E61202B8 */ swc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01CB0 80A038E0 C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -.L80A038E4: -/* 01CB4 80A038E4 3C0180A0 */ lui $at, %hi(D_80A061EC) ## $at = 80A00000 -/* 01CB8 80A038E8 4600203C */ c.lt.s $f4, $f0 -/* 01CBC 80A038EC 00000000 */ nop -/* 01CC0 80A038F0 45000004 */ bc1f .L80A03904 -/* 01CC4 80A038F4 00000000 */ nop -/* 01CC8 80A038F8 C42661EC */ lwc1 $f6, %lo(D_80A061EC)($at) -/* 01CCC 80A038FC 46060201 */ sub.s $f8, $f0, $f6 -/* 01CD0 80A03900 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 -.L80A03904: -/* 01CD4 80A03904 0C01DE0D */ jal Math_Coss - ## coss? -/* 01CD8 80A03908 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01CDC 80A0390C C60A02B8 */ lwc1 $f10, 0x02B8($s0) ## 000002B8 -/* 01CE0 80A03910 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01CE4 80A03914 460A0402 */ mul.s $f16, $f0, $f10 -/* 01CE8 80A03918 0C01DE1C */ jal Math_Sins - ## sins? -/* 01CEC 80A0391C E610028C */ swc1 $f16, 0x028C($s0) ## 0000028C -/* 01CF0 80A03920 C61202B8 */ lwc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01CF4 80A03924 861902AC */ lh $t9, 0x02AC($s0) ## 000002AC -/* 01CF8 80A03928 860802B0 */ lh $t0, 0x02B0($s0) ## 000002B0 -/* 01CFC 80A0392C 46009107 */ neg.s $f4, $f18 -/* 01D00 80A03930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D04 80A03934 46040182 */ mul.s $f6, $f0, $f4 -/* 01D08 80A03938 03284821 */ addu $t1, $t9, $t0 -/* 01D0C 80A0393C A60902AC */ sh $t1, 0x02AC($s0) ## 000002AC -/* 01D10 80A03940 E6060294 */ swc1 $f6, 0x0294($s0) ## 00000294 -/* 01D14 80A03944 8FA50024 */ lw $a1, 0x0024($sp) -/* 01D18 80A03948 0C280B8C */ jal func_80A02E30 -/* 01D1C 80A0394C 24A50908 */ addiu $a1, $a1, 0x0908 ## $a1 = 00000908 -/* 01D20 80A03950 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 01D24 80A03954 0C034199 */ jal atan2s - -/* 01D28 80A03958 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 01D2C 80A0395C A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 01D30 80A03960 8FA5002C */ lw $a1, 0x002C($sp) -/* 01D34 80A03964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D38 80A03968 0C28126D */ jal func_80A049B4 -/* 01D3C 80A0396C 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 01D40 80A03970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D44 80A03974 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D48 80A03978 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 01D4C 80A0397C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A03980: -/* 01D50 80A03980 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D54 80A03984 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D58 80A03988 03E00008 */ jr $ra -/* 01D5C 80A0398C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s deleted file mode 100644 index b6411cb9cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s +++ /dev/null @@ -1,89 +0,0 @@ -.late_rodata -glabel D_80A061F0 - .float 0.3499999940395355 - -glabel D_80A061F4 - .float 0.012345679104328156 - -glabel D_80A061F8 - .float 0.008 - -.text -glabel func_80A03990 -/* 01D60 80A03990 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D64 80A03994 AFBF001C */ sw $ra, 0x001C($sp) -/* 01D68 80A03998 AFB00018 */ sw $s0, 0x0018($sp) -/* 01D6C 80A0399C AFA5002C */ sw $a1, 0x002C($sp) -/* 01D70 80A039A0 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01D74 80A039A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D78 80A039A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D7C 80A039AC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01D80 80A039B0 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01D84 80A039B4 C60002B4 */ lwc1 $f0, 0x02B4($s0) ## 000002B4 -/* 01D88 80A039B8 C6040290 */ lwc1 $f4, 0x0290($s0) ## 00000290 -/* 01D8C 80A039BC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01D90 80A039C0 3C0180A0 */ lui $at, %hi(D_80A061F0) ## $at = 80A00000 -/* 01D94 80A039C4 46002180 */ add.s $f6, $f4, $f0 -/* 01D98 80A039C8 E6020294 */ swc1 $f2, 0x0294($s0) ## 00000294 -/* 01D9C 80A039CC E602028C */ swc1 $f2, 0x028C($s0) ## 0000028C -/* 01DA0 80A039D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DA4 80A039D4 E6060290 */ swc1 $f6, 0x0290($s0) ## 00000290 -/* 01DA8 80A039D8 C42861F0 */ lwc1 $f8, %lo(D_80A061F0)($at) -/* 01DAC 80A039DC 3C0580A0 */ lui $a1, %hi(func_80A03814) ## $a1 = 80A00000 -/* 01DB0 80A039E0 46080281 */ sub.s $f10, $f0, $f8 -/* 01DB4 80A039E4 E60A02B4 */ swc1 $f10, 0x02B4($s0) ## 000002B4 -/* 01DB8 80A039E8 C61002B4 */ lwc1 $f16, 0x02B4($s0) ## 000002B4 -/* 01DBC 80A039EC 4602803E */ c.le.s $f16, $f2 -/* 01DC0 80A039F0 00000000 */ nop -/* 01DC4 80A039F4 4502000C */ bc1fl .L80A03A28 -/* 01DC8 80A039F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 01DCC 80A039FC 0C28070C */ jal func_80A01C30 -/* 01DD0 80A03A00 24A53814 */ addiu $a1, $a1, %lo(func_80A03814) ## $a1 = 80A03814 -/* 01DD4 80A03A04 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DD8 80A03A08 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01DDC 80A03A0C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01DE0 80A03A10 24180800 */ addiu $t8, $zero, 0x0800 ## $t8 = 00000800 -/* 01DE4 80A03A14 A61802B0 */ sh $t8, 0x02B0($s0) ## 000002B0 -/* 01DE8 80A03A18 A60002AE */ sh $zero, 0x02AE($s0) ## 000002AE -/* 01DEC 80A03A1C E60202B4 */ swc1 $f2, 0x02B4($s0) ## 000002B4 -/* 01DF0 80A03A20 E61202B8 */ swc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01DF4 80A03A24 8FA50024 */ lw $a1, 0x0024($sp) -.L80A03A28: -/* 01DF8 80A03A28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DFC 80A03A2C 0C280B8C */ jal func_80A02E30 -/* 01E00 80A03A30 24A50908 */ addiu $a1, $a1, 0x0908 ## $a1 = 00000908 -/* 01E04 80A03A34 C60002B4 */ lwc1 $f0, 0x02B4($s0) ## 000002B4 -/* 01E08 80A03A38 3C0180A0 */ lui $at, %hi(D_80A061F4) ## $at = 80A00000 -/* 01E0C 80A03A3C C42661F4 */ lwc1 $f6, %lo(D_80A061F4)($at) -/* 01E10 80A03A40 46000102 */ mul.s $f4, $f0, $f0 -/* 01E14 80A03A44 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01E18 80A03A48 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 01E1C 80A03A4C 3C0180A0 */ lui $at, %hi(D_80A061F8) ## $at = 80A00000 -/* 01E20 80A03A50 C43261F8 */ lwc1 $f18, %lo(D_80A061F8)($at) -/* 01E24 80A03A54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E28 80A03A58 46062202 */ mul.s $f8, $f4, $f6 -/* 01E2C 80A03A5C 46085401 */ sub.s $f16, $f10, $f8 -/* 01E30 80A03A60 46128102 */ mul.s $f4, $f16, $f18 -/* 01E34 80A03A64 44052000 */ mfc1 $a1, $f4 -/* 01E38 80A03A68 0C00B58B */ jal Actor_SetScale - -/* 01E3C 80A03A6C 00000000 */ nop -/* 01E40 80A03A70 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 01E44 80A03A74 0C034199 */ jal atan2s - -/* 01E48 80A03A78 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 01E4C 80A03A7C A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 01E50 80A03A80 8FA5002C */ lw $a1, 0x002C($sp) -/* 01E54 80A03A84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E58 80A03A88 0C28126D */ jal func_80A049B4 -/* 01E5C 80A03A8C 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 01E60 80A03A90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E64 80A03A94 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E68 80A03A98 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 01E6C 80A03A9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E70 80A03AA0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01E74 80A03AA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01E78 80A03AA8 03E00008 */ jr $ra -/* 01E7C 80A03AAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s deleted file mode 100644 index e649e32cab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s +++ /dev/null @@ -1,45 +0,0 @@ -.rdata -glabel D_80A060C4 - .asciz "0" - .balign 4 - -glabel D_80A060C8 - .asciz "../z_en_elf.c" - .balign 4 - -.text -glabel func_80A03AB0 -/* 01E80 80A03AB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E84 80A03AB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01E88 80A03AB8 AFB00018 */ sw $s0, 0x0018($sp) -/* 01E8C 80A03ABC AFA50024 */ sw $a1, 0x0024($sp) -/* 01E90 80A03AC0 948E02C4 */ lhu $t6, 0x02C4($a0) ## 000002C4 -/* 01E94 80A03AC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E98 80A03AC8 31CF0004 */ andi $t7, $t6, 0x0004 ## $t7 = 00000000 -/* 01E9C 80A03ACC 11E00003 */ beq $t7, $zero, .L80A03ADC -/* 01EA0 80A03AD0 00000000 */ nop -/* 01EA4 80A03AD4 0C281105 */ jal func_80A04414 -/* 01EA8 80A03AD8 00000000 */ nop -.L80A03ADC: -/* 01EAC 80A03ADC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01EB0 80A03AE0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01EB4 80A03AE4 8E0202C8 */ lw $v0, 0x02C8($s0) ## 000002C8 -/* 01EB8 80A03AE8 3C0480A0 */ lui $a0, %hi(D_80A060C4) ## $a0 = 80A00000 -/* 01EBC 80A03AEC 248460C4 */ addiu $a0, $a0, %lo(D_80A060C4) ## $a0 = 80A060C4 -/* 01EC0 80A03AF0 14400005 */ bne $v0, $zero, .L80A03B08 -/* 01EC4 80A03AF4 3C0580A0 */ lui $a1, %hi(D_80A060C8) ## $a1 = 80A00000 -/* 01EC8 80A03AF8 24A560C8 */ addiu $a1, $a1, %lo(D_80A060C8) ## $a1 = 80A060C8 -/* 01ECC 80A03AFC 0C0007FC */ jal __assert - -/* 01ED0 80A03B00 240606BD */ addiu $a2, $zero, 0x06BD ## $a2 = 000006BD -/* 01ED4 80A03B04 8E0202C8 */ lw $v0, 0x02C8($s0) ## 000002C8 -.L80A03B08: -/* 01ED8 80A03B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EDC 80A03B0C 0040F809 */ jalr $ra, $v0 -/* 01EE0 80A03B10 8FA50024 */ lw $a1, 0x0024($sp) -/* 01EE4 80A03B14 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EE8 80A03B18 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EEC 80A03B1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EF0 80A03B20 03E00008 */ jr $ra -/* 01EF4 80A03B24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s deleted file mode 100644 index 20f995ada4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_80A03B28 -/* 01EF8 80A03B28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01EFC 80A03B2C AFBF002C */ sw $ra, 0x002C($sp) -/* 01F00 80A03B30 AFB00028 */ sw $s0, 0x0028($sp) -/* 01F04 80A03B34 AFA5003C */ sw $a1, 0x003C($sp) -/* 01F08 80A03B38 848E02A8 */ lh $t6, 0x02A8($a0) ## 000002A8 -/* 01F0C 80A03B3C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01F10 80A03B40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F14 80A03B44 15C10002 */ bne $t6, $at, .L80A03B50 -/* 01F18 80A03B48 24030064 */ addiu $v1, $zero, 0x0064 ## $v1 = 00000064 -/* 01F1C 80A03B4C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A03B50: -/* 01F20 80A03B50 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 01F24 80A03B54 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 01F28 80A03B58 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 01F2C 80A03B5C 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 01F30 80A03B60 13000029 */ beq $t8, $zero, .L80A03C08 -/* 01F34 80A03B64 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 01F38 80A03B68 8FB9003C */ lw $t9, 0x003C($sp) -/* 01F3C 80A03B6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01F40 80A03B70 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01F44 80A03B74 8F221C44 */ lw $v0, 0x1C44($t9) ## 00001C44 -/* 01F48 80A03B78 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01F4C 80A03B7C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01F50 80A03B80 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 01F54 80A03B84 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 01F58 80A03B88 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 01F5C 80A03B8C 4600428D */ trunc.w.s $f10, $f8 -/* 01F60 80A03B90 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 01F64 80A03B94 4600218D */ trunc.w.s $f6, $f4 -/* 01F68 80A03B98 440A5000 */ mfc1 $t2, $f10 -/* 01F6C 80A03B9C 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 01F70 80A03BA0 C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C -/* 01F74 80A03BA4 000A5C00 */ sll $t3, $t2, 16 -/* 01F78 80A03BA8 000B6403 */ sra $t4, $t3, 16 -/* 01F7C 80A03BAC 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 01F80 80A03BB0 44053000 */ mfc1 $a1, $f6 -/* 01F84 80A03BB4 A7A30036 */ sh $v1, 0x0036($sp) -/* 01F88 80A03BB8 468084A0 */ cvt.s.w $f18, $f16 -/* 01F8C 80A03BBC 00052C00 */ sll $a1, $a1, 16 -/* 01F90 80A03BC0 00052C03 */ sra $a1, $a1, 16 -/* 01F94 80A03BC4 AFA8001C */ sw $t0, 0x001C($sp) -/* 01F98 80A03BC8 AFB90018 */ sw $t9, 0x0018($sp) -/* 01F9C 80A03BCC 4600540D */ trunc.w.s $f16, $f10 -/* 01FA0 80A03BD0 AFB80014 */ sw $t8, 0x0014($sp) -/* 01FA4 80A03BD4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01FA8 80A03BD8 46049180 */ add.s $f6, $f18, $f4 -/* 01FAC 80A03BDC 44078000 */ mfc1 $a3, $f16 -/* 01FB0 80A03BE0 4600320D */ trunc.w.s $f8, $f6 -/* 01FB4 80A03BE4 00073C00 */ sll $a3, $a3, 16 -/* 01FB8 80A03BE8 00073C03 */ sra $a3, $a3, 16 -/* 01FBC 80A03BEC 44064000 */ mfc1 $a2, $f8 -/* 01FC0 80A03BF0 00000000 */ nop -/* 01FC4 80A03BF4 00063400 */ sll $a2, $a2, 16 -/* 01FC8 80A03BF8 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 01FCC 80A03BFC 00063403 */ sra $a2, $a2, 16 -/* 01FD0 80A03C00 10000019 */ beq $zero, $zero, .L80A03C68 -/* 01FD4 80A03C04 87A30036 */ lh $v1, 0x0036($sp) -.L80A03C08: -/* 01FD8 80A03C08 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 01FDC 80A03C0C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01FE0 80A03C10 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01FE4 80A03C14 4600910D */ trunc.w.s $f4, $f18 -/* 01FE8 80A03C18 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01FEC 80A03C1C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 01FF0 80A03C20 4600320D */ trunc.w.s $f8, $f6 -/* 01FF4 80A03C24 44052000 */ mfc1 $a1, $f4 -/* 01FF8 80A03C28 AFAF001C */ sw $t7, 0x001C($sp) -/* 01FFC 80A03C2C 4600540D */ trunc.w.s $f16, $f10 -/* 02000 80A03C30 44064000 */ mfc1 $a2, $f8 -/* 02004 80A03C34 00052C00 */ sll $a1, $a1, 16 -/* 02008 80A03C38 00052C03 */ sra $a1, $a1, 16 -/* 0200C 80A03C3C 44078000 */ mfc1 $a3, $f16 -/* 02010 80A03C40 00063400 */ sll $a2, $a2, 16 -/* 02014 80A03C44 00063403 */ sra $a2, $a2, 16 -/* 02018 80A03C48 00073C00 */ sll $a3, $a3, 16 -/* 0201C 80A03C4C 00073C03 */ sra $a3, $a3, 16 -/* 02020 80A03C50 AFAE0018 */ sw $t6, 0x0018($sp) -/* 02024 80A03C54 A7A30036 */ sh $v1, 0x0036($sp) -/* 02028 80A03C58 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0202C 80A03C5C 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 02030 80A03C60 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02034 80A03C64 87A30036 */ lh $v1, 0x0036($sp) -.L80A03C68: -/* 02038 80A03C68 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 0203C 80A03C6C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 02040 80A03C70 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02044 80A03C74 4600910D */ trunc.w.s $f4, $f18 -/* 02048 80A03C78 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 0204C 80A03C7C 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 02050 80A03C80 4600320D */ trunc.w.s $f8, $f6 -/* 02054 80A03C84 44052000 */ mfc1 $a1, $f4 -/* 02058 80A03C88 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0205C 80A03C8C 4600540D */ trunc.w.s $f16, $f10 -/* 02060 80A03C90 44064000 */ mfc1 $a2, $f8 -/* 02064 80A03C94 00052C00 */ sll $a1, $a1, 16 -/* 02068 80A03C98 00052C03 */ sra $a1, $a1, 16 -/* 0206C 80A03C9C 44078000 */ mfc1 $a3, $f16 -/* 02070 80A03CA0 00063400 */ sll $a2, $a2, 16 -/* 02074 80A03CA4 00063403 */ sra $a2, $a2, 16 -/* 02078 80A03CA8 00073C00 */ sll $a3, $a3, 16 -/* 0207C 80A03CAC 00073C03 */ sra $a3, $a3, 16 -/* 02080 80A03CB0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 02084 80A03CB4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 02088 80A03CB8 AFA90010 */ sw $t1, 0x0010($sp) -/* 0208C 80A03CBC AFA3001C */ sw $v1, 0x001C($sp) -/* 02090 80A03CC0 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 02094 80A03CC4 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 02098 80A03CC8 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 0209C 80A03CCC 0C034199 */ jal atan2s - -/* 020A0 80A03CD0 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 020A4 80A03CD4 A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 020A8 80A03CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020AC 80A03CDC 0C00B58B */ jal Actor_SetScale - -/* 020B0 80A03CE0 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 020B4 80A03CE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 020B8 80A03CE8 8FB00028 */ lw $s0, 0x0028($sp) -/* 020BC 80A03CEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 020C0 80A03CF0 03E00008 */ jr $ra -/* 020C4 80A03CF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s index 06c183be41..0a2d6bd3ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s @@ -59,7 +59,7 @@ glabel func_80A03CF8 /* 02120 80A03D50 53200053 */ beql $t9, $zero, .L80A03EA0 /* 02124 80A03D54 AFA50030 */ sw $a1, 0x0030($sp) /* 02128 80A03D58 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFF4 -/* 0212C 80A03D5C 0C2817C4 */ jal func_80A05F10 +/* 0212C 80A03D5C 0C2817C4 */ jal EnElf_GetCutsceneNextPos /* 02130 80A03D60 01E02825 */ or $a1, $t7, $zero ## $a1 = 00000000 /* 02134 80A03D64 8FA80064 */ lw $t0, 0x0064($sp) /* 02138 80A03D68 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 @@ -69,7 +69,7 @@ glabel func_80A03CF8 /* 02148 80A03D78 952A0000 */ lhu $t2, 0x0000($t1) ## 00000000 /* 0214C 80A03D7C 55410004 */ bnel $t2, $at, .L80A03D90 /* 02150 80A03D80 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 -/* 02154 80A03D84 0C28126D */ jal func_80A049B4 +/* 02154 80A03D84 0C28126D */ jal EnElf_SpawnSparkles /* 02158 80A03D88 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 0215C 80A03D8C 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 .L80A03D90: @@ -229,7 +229,7 @@ glabel func_80A03CF8 /* 0238C 80A03FBC C42A6208 */ lwc1 $f10, %lo(D_80A06208)($at) /* 02390 80A03FC0 E7AA003C */ swc1 $f10, 0x003C($sp) .L80A03FC4: -/* 02394 80A03FC4 0C28126D */ jal func_80A049B4 +/* 02394 80A03FC4 0C28126D */ jal EnElf_SpawnSparkles /* 02398 80A03FC8 8FA50064 */ lw $a1, 0x0064($sp) /* 0239C 80A03FCC 100000D2 */ beq $zero, $zero, .L80A04318 /* 023A0 80A03FD0 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 @@ -272,7 +272,7 @@ glabel func_80A03CF8 /* 0242C 80A0405C E7A60058 */ swc1 $f6, 0x0058($sp) /* 02430 80A04060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02434 80A04064 8FA50064 */ lw $a1, 0x0064($sp) -/* 02438 80A04068 0C28126D */ jal func_80A049B4 +/* 02438 80A04068 0C28126D */ jal EnElf_SpawnSparkles /* 0243C 80A0406C 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 02440 80A04070 3C014198 */ lui $at, 0x4198 ## $at = 41980000 /* 02444 80A04074 44815000 */ mtc1 $at, $f10 ## $f10 = 19.00 @@ -383,7 +383,7 @@ glabel func_80A03CF8 /* 025D4 80A04204 00000000 */ nop /* 025D8 80A04208 45020043 */ bc1fl .L80A04318 /* 025DC 80A0420C 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 025E0 80A04210 0C28126D */ jal func_80A049B4 +/* 025E0 80A04210 0C28126D */ jal EnElf_SpawnSparkles /* 025E4 80A04214 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 025E8 80A04218 1000003F */ beq $zero, $zero, .L80A04318 /* 025EC 80A0421C 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 @@ -425,7 +425,7 @@ glabel func_80A03CF8 /* 0266C 80A0429C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02670 80A042A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02674 80A042A4 8FA50064 */ lw $a1, 0x0064($sp) -/* 02678 80A042A8 0C28126D */ jal func_80A049B4 +/* 02678 80A042A8 0C28126D */ jal EnElf_SpawnSparkles /* 0267C 80A042AC 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 02680 80A042B0 10000019 */ beq $zero, $zero, .L80A04318 /* 02684 80A042B4 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 @@ -484,7 +484,7 @@ glabel func_80A03CF8 /* 02738 80A04368 E7B20010 */ swc1 $f18, 0x0010($sp) .L80A0436C: /* 0273C 80A0436C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02740 80A04370 0C280ECA */ jal func_80A03B28 +/* 02740 80A04370 0C280ECA */ jal EnElf_UpdateLights /* 02744 80A04374 8FA50064 */ lw $a1, 0x0064($sp) /* 02748 80A04378 8FBF0024 */ lw $ra, 0x0024($sp) /* 0274C 80A0437C 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s deleted file mode 100644 index f6f51d0571..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A0438C -/* 0275C 80A0438C AFA7000C */ sw $a3, 0x000C($sp) -/* 02760 80A04390 C4C60000 */ lwc1 $f6, 0x0000($a2) ## 00000000 -/* 02764 80A04394 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 02768 80A04398 C4CA0004 */ lwc1 $f10, 0x0004($a2) ## 00000004 -/* 0276C 80A0439C C4A80004 */ lwc1 $f8, 0x0004($a1) ## 00000004 -/* 02770 80A043A0 46062001 */ sub.s $f0, $f4, $f6 -/* 02774 80A043A4 C4D20008 */ lwc1 $f18, 0x0008($a2) ## 00000008 -/* 02778 80A043A8 C4B00008 */ lwc1 $f16, 0x0008($a1) ## 00000008 -/* 0277C 80A043AC 460A4081 */ sub.s $f2, $f8, $f10 -/* 02780 80A043B0 C7AA000C */ lwc1 $f10, 0x000C($sp) -/* 02784 80A043B4 C4880000 */ lwc1 $f8, 0x0000($a0) ## 00000000 -/* 02788 80A043B8 46128301 */ sub.s $f12, $f16, $f18 -/* 0278C 80A043BC 460A0402 */ mul.s $f16, $f0, $f10 -/* 02790 80A043C0 C4C6000C */ lwc1 $f6, 0x000C($a2) ## 0000000C -/* 02794 80A043C4 C4A4000C */ lwc1 $f4, 0x000C($a1) ## 0000000C -/* 02798 80A043C8 46062381 */ sub.s $f14, $f4, $f6 -/* 0279C 80A043CC C4840004 */ lwc1 $f4, 0x0004($a0) ## 00000004 -/* 027A0 80A043D0 46104480 */ add.s $f18, $f8, $f16 -/* 027A4 80A043D4 C4900008 */ lwc1 $f16, 0x0008($a0) ## 00000008 -/* 027A8 80A043D8 E4920000 */ swc1 $f18, 0x0000($a0) ## 00000000 -/* 027AC 80A043DC C7A6000C */ lwc1 $f6, 0x000C($sp) -/* 027B0 80A043E0 46061282 */ mul.s $f10, $f2, $f6 -/* 027B4 80A043E4 460A2200 */ add.s $f8, $f4, $f10 -/* 027B8 80A043E8 C48A000C */ lwc1 $f10, 0x000C($a0) ## 0000000C -/* 027BC 80A043EC E4880004 */ swc1 $f8, 0x0004($a0) ## 00000004 -/* 027C0 80A043F0 C7B2000C */ lwc1 $f18, 0x000C($sp) -/* 027C4 80A043F4 46126182 */ mul.s $f6, $f12, $f18 -/* 027C8 80A043F8 46068100 */ add.s $f4, $f16, $f6 -/* 027CC 80A043FC E4840008 */ swc1 $f4, 0x0008($a0) ## 00000008 -/* 027D0 80A04400 C7A8000C */ lwc1 $f8, 0x000C($sp) -/* 027D4 80A04404 46087482 */ mul.s $f18, $f14, $f8 -/* 027D8 80A04408 46125400 */ add.s $f16, $f10, $f18 -/* 027DC 80A0440C 03E00008 */ jr $ra -/* 027E0 80A04410 E490000C */ swc1 $f16, 0x000C($a0) ## 0000000C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s deleted file mode 100644 index 87e1827a39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel func_80A04414 -/* 027E4 80A04414 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027E8 80A04418 AFBF001C */ sw $ra, 0x001C($sp) -/* 027EC 80A0441C AFB00018 */ sw $s0, 0x0018($sp) -/* 027F0 80A04420 8CAE1CC8 */ lw $t6, 0x1CC8($a1) ## 00001CC8 -/* 027F4 80A04424 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 027F8 80A04428 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 027FC 80A0442C AFAE002C */ sw $t6, 0x002C($sp) -/* 02800 80A04430 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 02804 80A04434 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 02808 80A04438 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0280C 80A0443C AFAF0028 */ sw $t7, 0x0028($sp) -/* 02810 80A04440 C4A41CD0 */ lwc1 $f4, 0x1CD0($a1) ## 00001CD0 -/* 02814 80A04444 46040032 */ c.eq.s $f0, $f4 -/* 02818 80A04448 00000000 */ nop -/* 0281C 80A0444C 4503000B */ bc1tl .L80A0447C -/* 02820 80A04450 921902C6 */ lbu $t9, 0x02C6($s0) ## 000002C6 -/* 02824 80A04454 909802C7 */ lbu $t8, 0x02C7($a0) ## 000002C7 -/* 02828 80A04458 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0282C 80A0445C A08002C6 */ sb $zero, 0x02C6($a0) ## 000002C6 -/* 02830 80A04460 17000044 */ bne $t8, $zero, .L80A04574 -/* 02834 80A04464 E486029C */ swc1 $f6, 0x029C($a0) ## 0000029C -/* 02838 80A04468 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0283C 80A0446C 2405281B */ addiu $a1, $zero, 0x281B ## $a1 = 0000281B -/* 02840 80A04470 10000041 */ beq $zero, $zero, .L80A04578 -/* 02844 80A04474 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 02848 80A04478 921902C6 */ lbu $t9, 0x02C6($s0) ## 000002C6 -.L80A0447C: -/* 0284C 80A0447C 8FA8002C */ lw $t0, 0x002C($sp) -/* 02850 80A04480 5720000F */ bnel $t9, $zero, .L80A044C0 -/* 02854 80A04484 C60A029C */ lwc1 $f10, 0x029C($s0) ## 0000029C -/* 02858 80A04488 11000009 */ beq $t0, $zero, .L80A044B0 -/* 0285C 80A0448C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 02860 80A04490 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 02864 80A04494 24E51C90 */ addiu $a1, $a3, 0x1C90 ## $a1 = 00001C90 -/* 02868 80A04498 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0286C 80A0449C 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 02870 80A044A0 00000000 */ nop -/* 02874 80A044A4 4608003C */ c.lt.s $f0, $f8 -/* 02878 80A044A8 00000000 */ nop -/* 0287C 80A044AC 45000031 */ bc1f .L80A04574 -.L80A044B0: -/* 02880 80A044B0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02884 80A044B4 1000002F */ beq $zero, $zero, .L80A04574 -/* 02888 80A044B8 A20902C6 */ sb $t1, 0x02C6($s0) ## 000002C6 -/* 0288C 80A044BC C60A029C */ lwc1 $f10, 0x029C($s0) ## 0000029C -.L80A044C0: -/* 02890 80A044C0 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C -/* 02894 80A044C4 3C063E80 */ lui $a2, 0x3E80 ## $a2 = 3E800000 -/* 02898 80A044C8 460A0032 */ c.eq.s $f0, $f10 -/* 0289C 80A044CC 00000000 */ nop -/* 028A0 80A044D0 45030029 */ bc1tl .L80A04578 -/* 028A4 80A044D4 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 028A8 80A044D8 44050000 */ mfc1 $a1, $f0 -/* 028AC 80A044DC 0C01DE80 */ jal Math_ApproxF - -/* 028B0 80A044E0 AFA70034 */ sw $a3, 0x0034($sp) -/* 028B4 80A044E4 10400012 */ beq $v0, $zero, .L80A04530 -/* 028B8 80A044E8 8FA30034 */ lw $v1, 0x0034($sp) -/* 028BC 80A044EC 8C6B1CA8 */ lw $t3, 0x1CA8($v1) ## 00001CA8 -/* 028C0 80A044F0 AE0B0244 */ sw $t3, 0x0244($s0) ## 00000244 -/* 028C4 80A044F4 8C6A1CAC */ lw $t2, 0x1CAC($v1) ## 00001CAC -/* 028C8 80A044F8 AE0A0248 */ sw $t2, 0x0248($s0) ## 00000248 -/* 028CC 80A044FC 8C6B1CB0 */ lw $t3, 0x1CB0($v1) ## 00001CB0 -/* 028D0 80A04500 AE0B024C */ sw $t3, 0x024C($s0) ## 0000024C -/* 028D4 80A04504 8C6A1CB4 */ lw $t2, 0x1CB4($v1) ## 00001CB4 -/* 028D8 80A04508 AE0A0250 */ sw $t2, 0x0250($s0) ## 00000250 -/* 028DC 80A0450C 8C6D1CB8 */ lw $t5, 0x1CB8($v1) ## 00001CB8 -/* 028E0 80A04510 AE0D0254 */ sw $t5, 0x0254($s0) ## 00000254 -/* 028E4 80A04514 8C6C1CBC */ lw $t4, 0x1CBC($v1) ## 00001CBC -/* 028E8 80A04518 AE0C0258 */ sw $t4, 0x0258($s0) ## 00000258 -/* 028EC 80A0451C 8C6D1CC0 */ lw $t5, 0x1CC0($v1) ## 00001CC0 -/* 028F0 80A04520 AE0D025C */ sw $t5, 0x025C($s0) ## 0000025C -/* 028F4 80A04524 8C6C1CC4 */ lw $t4, 0x1CC4($v1) ## 00001CC4 -/* 028F8 80A04528 10000012 */ beq $zero, $zero, .L80A04574 -/* 028FC 80A0452C AE0C0260 */ sw $t4, 0x0260($s0) ## 00000260 -.L80A04530: -/* 02900 80A04530 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 02904 80A04534 44818000 */ mtc1 $at, $f16 ## $f16 = 0.25 -/* 02908 80A04538 C612029C */ lwc1 $f18, 0x029C($s0) ## 0000029C -/* 0290C 80A0453C 26040244 */ addiu $a0, $s0, 0x0244 ## $a0 = 00000244 -/* 02910 80A04540 00803025 */ or $a2, $a0, $zero ## $a2 = 00000244 -/* 02914 80A04544 46128003 */ div.s $f0, $f16, $f18 -/* 02918 80A04548 24651CA8 */ addiu $a1, $v1, 0x1CA8 ## $a1 = 00001CA8 -/* 0291C 80A0454C 44070000 */ mfc1 $a3, $f0 -/* 02920 80A04550 0C2810E3 */ jal func_80A0438C -/* 02924 80A04554 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 02928 80A04558 C7A00024 */ lwc1 $f0, 0x0024($sp) -/* 0292C 80A0455C 8FA30034 */ lw $v1, 0x0034($sp) -/* 02930 80A04560 26040254 */ addiu $a0, $s0, 0x0254 ## $a0 = 00000254 -/* 02934 80A04564 44070000 */ mfc1 $a3, $f0 -/* 02938 80A04568 00803025 */ or $a2, $a0, $zero ## $a2 = 00000254 -/* 0293C 80A0456C 0C2810E3 */ jal func_80A0438C -/* 02940 80A04570 24651CB8 */ addiu $a1, $v1, 0x1CB8 ## $a1 = 00001CB8 -.L80A04574: -/* 02944 80A04574 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A04578: -/* 02948 80A04578 8FAF002C */ lw $t7, 0x002C($sp) -/* 0294C 80A0457C 8FA9002C */ lw $t1, 0x002C($sp) -/* 02950 80A04580 306E0001 */ andi $t6, $v1, 0x0001 ## $t6 = 00000000 -/* 02954 80A04584 11C00008 */ beq $t6, $zero, .L80A045A8 -/* 02958 80A04588 00000000 */ nop -/* 0295C 80A0458C 11E00003 */ beq $t7, $zero, .L80A0459C -/* 02960 80A04590 8FB80028 */ lw $t8, 0x0028($sp) -/* 02964 80A04594 8F190664 */ lw $t9, 0x0664($t8) ## 00000664 -/* 02968 80A04598 1720001B */ bne $t9, $zero, .L80A04608 -.L80A0459C: -/* 0296C 80A0459C 38680001 */ xori $t0, $v1, 0x0001 ## $t0 = 00000001 -/* 02970 80A045A0 10000019 */ beq $zero, $zero, .L80A04608 -/* 02974 80A045A4 A60802C4 */ sh $t0, 0x02C4($s0) ## 000002C4 -.L80A045A8: -/* 02978 80A045A8 11200017 */ beq $t1, $zero, .L80A04608 -/* 0297C 80A045AC 8FAA0028 */ lw $t2, 0x0028($sp) -/* 02980 80A045B0 8D4B0664 */ lw $t3, 0x0664($t2) ## 00000664 -/* 02984 80A045B4 51600015 */ beql $t3, $zero, .L80A0460C -/* 02988 80A045B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0298C 80A045BC 91220002 */ lbu $v0, 0x0002($t1) ## 00000002 -/* 02990 80A045C0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02994 80A045C4 920402C7 */ lbu $a0, 0x02C7($s0) ## 000002C7 -/* 02998 80A045C8 54410004 */ bnel $v0, $at, .L80A045DC -/* 0299C 80A045CC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 029A0 80A045D0 10000006 */ beq $zero, $zero, .L80A045EC -/* 029A4 80A045D4 24056841 */ addiu $a1, $zero, 0x6841 ## $a1 = 00006841 -/* 029A8 80A045D8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80A045DC: -/* 029AC 80A045DC 14410003 */ bne $v0, $at, .L80A045EC -/* 029B0 80A045E0 24056842 */ addiu $a1, $zero, 0x6842 ## $a1 = 00006842 -/* 029B4 80A045E4 10000001 */ beq $zero, $zero, .L80A045EC -/* 029B8 80A045E8 24056840 */ addiu $a1, $zero, 0x6840 ## $a1 = 00006840 -.L80A045EC: -/* 029BC 80A045EC 54800005 */ bnel $a0, $zero, .L80A04604 -/* 029C0 80A045F0 346C0001 */ ori $t4, $v1, 0x0001 ## $t4 = 00000001 -/* 029C4 80A045F4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 029C8 80A045F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029CC 80A045FC 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 029D0 80A04600 346C0001 */ ori $t4, $v1, 0x0001 ## $t4 = 00000001 -.L80A04604: -/* 029D4 80A04604 A60C02C4 */ sh $t4, 0x02C4($s0) ## 000002C4 -.L80A04608: -/* 029D8 80A04608 8FBF001C */ lw $ra, 0x001C($sp) -.L80A0460C: -/* 029DC 80A0460C 8FB00018 */ lw $s0, 0x0018($sp) -/* 029E0 80A04610 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 029E4 80A04614 03E00008 */ jr $ra -/* 029E8 80A04618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s deleted file mode 100644 index 8137af68e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s +++ /dev/null @@ -1,269 +0,0 @@ -glabel func_80A049B4 -/* 02D84 80A049B4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02D88 80A049B8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02D8C 80A049BC AFBF002C */ sw $ra, 0x002C($sp) -/* 02D90 80A049C0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02D94 80A049C4 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 02D98 80A049C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D9C 80A049CC AFA5004C */ sw $a1, 0x004C($sp) -/* 02DA0 80A049D0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02DA4 80A049D4 AFA60050 */ sw $a2, 0x0050($sp) -/* 02DA8 80A049D8 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02DAC 80A049DC 46040180 */ add.s $f6, $f0, $f4 -/* 02DB0 80A049E0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 02DB4 80A049E4 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 02DB8 80A049E8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02DBC 80A049EC 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 02DC0 80A049F0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 02DC4 80A049F4 460C0202 */ mul.s $f8, $f0, $f12 -/* 02DC8 80A049F8 460A4400 */ add.s $f16, $f8, $f10 -/* 02DCC 80A049FC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02DD0 80A04A00 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 02DD4 80A04A04 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 02DD8 80A04A08 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02DDC 80A04A0C 3C0680A0 */ lui $a2, %hi(D_80A0608C) ## $a2 = 80A00000 -/* 02DE0 80A04A10 46120100 */ add.s $f4, $f0, $f18 -/* 02DE4 80A04A14 3C0780A0 */ lui $a3, %hi(D_80A06098) ## $a3 = 80A00000 -/* 02DE8 80A04A18 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02DEC 80A04A1C 24E76098 */ addiu $a3, $a3, %lo(D_80A06098) ## $a3 = 80A06098 -/* 02DF0 80A04A20 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 02DF4 80A04A24 444EF800 */ cfc1 $t6, $31 -/* 02DF8 80A04A28 44CFF800 */ ctc1 $t7, $31 -/* 02DFC 80A04A2C C6060244 */ lwc1 $f6, 0x0244($s0) ## 00000244 -/* 02E00 80A04A30 24C6608C */ addiu $a2, $a2, %lo(D_80A0608C) ## $a2 = 80A0608C -/* 02E04 80A04A34 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFF0 -/* 02E08 80A04A38 46003224 */ cvt.w.s $f8, $f6 -/* 02E0C 80A04A3C 444FF800 */ cfc1 $t7, $31 -/* 02E10 80A04A40 00000000 */ nop -/* 02E14 80A04A44 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02E18 80A04A48 51E00013 */ beql $t7, $zero, .L80A04A98 -/* 02E1C 80A04A4C 440F4000 */ mfc1 $t7, $f8 -/* 02E20 80A04A50 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 02E24 80A04A54 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02E28 80A04A58 46083201 */ sub.s $f8, $f6, $f8 -/* 02E2C 80A04A5C 44CFF800 */ ctc1 $t7, $31 -/* 02E30 80A04A60 00000000 */ nop -/* 02E34 80A04A64 46004224 */ cvt.w.s $f8, $f8 -/* 02E38 80A04A68 444FF800 */ cfc1 $t7, $31 -/* 02E3C 80A04A6C 00000000 */ nop -/* 02E40 80A04A70 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02E44 80A04A74 15E00005 */ bne $t7, $zero, .L80A04A8C -/* 02E48 80A04A78 00000000 */ nop -/* 02E4C 80A04A7C 440F4000 */ mfc1 $t7, $f8 -/* 02E50 80A04A80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02E54 80A04A84 10000007 */ beq $zero, $zero, .L80A04AA4 -/* 02E58 80A04A88 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80A04A8C: -/* 02E5C 80A04A8C 10000005 */ beq $zero, $zero, .L80A04AA4 -/* 02E60 80A04A90 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02E64 80A04A94 440F4000 */ mfc1 $t7, $f8 -.L80A04A98: -/* 02E68 80A04A98 00000000 */ nop -/* 02E6C 80A04A9C 05E0FFFB */ bltz $t7, .L80A04A8C -/* 02E70 80A04AA0 00000000 */ nop -.L80A04AA4: -/* 02E74 80A04AA4 44CEF800 */ ctc1 $t6, $31 -/* 02E78 80A04AA8 A3AF0034 */ sb $t7, 0x0034($sp) -/* 02E7C 80A04AAC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02E80 80A04AB0 C60A0248 */ lwc1 $f10, 0x0248($s0) ## 00000248 -/* 02E84 80A04AB4 4458F800 */ cfc1 $t8, $31 -/* 02E88 80A04AB8 44D9F800 */ ctc1 $t9, $31 -/* 02E8C 80A04ABC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02E90 80A04AC0 46005424 */ cvt.w.s $f16, $f10 -/* 02E94 80A04AC4 4459F800 */ cfc1 $t9, $31 -/* 02E98 80A04AC8 00000000 */ nop -/* 02E9C 80A04ACC 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02EA0 80A04AD0 53200013 */ beql $t9, $zero, .L80A04B20 -/* 02EA4 80A04AD4 44198000 */ mfc1 $t9, $f16 -/* 02EA8 80A04AD8 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 02EAC 80A04ADC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02EB0 80A04AE0 46105401 */ sub.s $f16, $f10, $f16 -/* 02EB4 80A04AE4 44D9F800 */ ctc1 $t9, $31 -/* 02EB8 80A04AE8 00000000 */ nop -/* 02EBC 80A04AEC 46008424 */ cvt.w.s $f16, $f16 -/* 02EC0 80A04AF0 4459F800 */ cfc1 $t9, $31 -/* 02EC4 80A04AF4 00000000 */ nop -/* 02EC8 80A04AF8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02ECC 80A04AFC 17200005 */ bne $t9, $zero, .L80A04B14 -/* 02ED0 80A04B00 00000000 */ nop -/* 02ED4 80A04B04 44198000 */ mfc1 $t9, $f16 -/* 02ED8 80A04B08 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02EDC 80A04B0C 10000007 */ beq $zero, $zero, .L80A04B2C -/* 02EE0 80A04B10 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80A04B14: -/* 02EE4 80A04B14 10000005 */ beq $zero, $zero, .L80A04B2C -/* 02EE8 80A04B18 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 02EEC 80A04B1C 44198000 */ mfc1 $t9, $f16 -.L80A04B20: -/* 02EF0 80A04B20 00000000 */ nop -/* 02EF4 80A04B24 0720FFFB */ bltz $t9, .L80A04B14 -/* 02EF8 80A04B28 00000000 */ nop -.L80A04B2C: -/* 02EFC 80A04B2C 44D8F800 */ ctc1 $t8, $31 -/* 02F00 80A04B30 A3B90035 */ sb $t9, 0x0035($sp) -/* 02F04 80A04B34 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02F08 80A04B38 C612024C */ lwc1 $f18, 0x024C($s0) ## 0000024C -/* 02F0C 80A04B3C 4448F800 */ cfc1 $t0, $31 -/* 02F10 80A04B40 44C9F800 */ ctc1 $t1, $31 -/* 02F14 80A04B44 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02F18 80A04B48 27B90030 */ addiu $t9, $sp, 0x0030 ## $t9 = FFFFFFE8 -/* 02F1C 80A04B4C 46009124 */ cvt.w.s $f4, $f18 -/* 02F20 80A04B50 27B80034 */ addiu $t8, $sp, 0x0034 ## $t8 = FFFFFFEC -/* 02F24 80A04B54 4449F800 */ cfc1 $t1, $31 -/* 02F28 80A04B58 00000000 */ nop -/* 02F2C 80A04B5C 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02F30 80A04B60 51200013 */ beql $t1, $zero, .L80A04BB0 -/* 02F34 80A04B64 44092000 */ mfc1 $t1, $f4 -/* 02F38 80A04B68 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 02F3C 80A04B6C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02F40 80A04B70 46049101 */ sub.s $f4, $f18, $f4 -/* 02F44 80A04B74 44C9F800 */ ctc1 $t1, $31 -/* 02F48 80A04B78 00000000 */ nop -/* 02F4C 80A04B7C 46002124 */ cvt.w.s $f4, $f4 -/* 02F50 80A04B80 4449F800 */ cfc1 $t1, $31 -/* 02F54 80A04B84 00000000 */ nop -/* 02F58 80A04B88 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02F5C 80A04B8C 15200005 */ bne $t1, $zero, .L80A04BA4 -/* 02F60 80A04B90 00000000 */ nop -/* 02F64 80A04B94 44092000 */ mfc1 $t1, $f4 -/* 02F68 80A04B98 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02F6C 80A04B9C 10000007 */ beq $zero, $zero, .L80A04BBC -/* 02F70 80A04BA0 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 -.L80A04BA4: -/* 02F74 80A04BA4 10000005 */ beq $zero, $zero, .L80A04BBC -/* 02F78 80A04BA8 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 02F7C 80A04BAC 44092000 */ mfc1 $t1, $f4 -.L80A04BB0: -/* 02F80 80A04BB0 00000000 */ nop -/* 02F84 80A04BB4 0520FFFB */ bltz $t1, .L80A04BA4 -/* 02F88 80A04BB8 00000000 */ nop -.L80A04BBC: -/* 02F8C 80A04BBC 44C8F800 */ ctc1 $t0, $31 -/* 02F90 80A04BC0 A3A90036 */ sb $t1, 0x0036($sp) -/* 02F94 80A04BC4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02F98 80A04BC8 C6060254 */ lwc1 $f6, 0x0254($s0) ## 00000254 -/* 02F9C 80A04BCC 444AF800 */ cfc1 $t2, $31 -/* 02FA0 80A04BD0 44CBF800 */ ctc1 $t3, $31 -/* 02FA4 80A04BD4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02FA8 80A04BD8 240803E8 */ addiu $t0, $zero, 0x03E8 ## $t0 = 000003E8 -/* 02FAC 80A04BDC 46003224 */ cvt.w.s $f8, $f6 -/* 02FB0 80A04BE0 444BF800 */ cfc1 $t3, $31 -/* 02FB4 80A04BE4 00000000 */ nop -/* 02FB8 80A04BE8 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 02FBC 80A04BEC 51600013 */ beql $t3, $zero, .L80A04C3C -/* 02FC0 80A04BF0 440B4000 */ mfc1 $t3, $f8 -/* 02FC4 80A04BF4 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 02FC8 80A04BF8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02FCC 80A04BFC 46083201 */ sub.s $f8, $f6, $f8 -/* 02FD0 80A04C00 44CBF800 */ ctc1 $t3, $31 -/* 02FD4 80A04C04 00000000 */ nop -/* 02FD8 80A04C08 46004224 */ cvt.w.s $f8, $f8 -/* 02FDC 80A04C0C 444BF800 */ cfc1 $t3, $31 -/* 02FE0 80A04C10 00000000 */ nop -/* 02FE4 80A04C14 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 02FE8 80A04C18 15600005 */ bne $t3, $zero, .L80A04C30 -/* 02FEC 80A04C1C 00000000 */ nop -/* 02FF0 80A04C20 440B4000 */ mfc1 $t3, $f8 -/* 02FF4 80A04C24 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02FF8 80A04C28 10000007 */ beq $zero, $zero, .L80A04C48 -/* 02FFC 80A04C2C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L80A04C30: -/* 03000 80A04C30 10000005 */ beq $zero, $zero, .L80A04C48 -/* 03004 80A04C34 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 03008 80A04C38 440B4000 */ mfc1 $t3, $f8 -.L80A04C3C: -/* 0300C 80A04C3C 00000000 */ nop -/* 03010 80A04C40 0560FFFB */ bltz $t3, .L80A04C30 -/* 03014 80A04C44 00000000 */ nop -.L80A04C48: -/* 03018 80A04C48 44CAF800 */ ctc1 $t2, $31 -/* 0301C 80A04C4C A3AB0030 */ sb $t3, 0x0030($sp) -/* 03020 80A04C50 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03024 80A04C54 C60A0258 */ lwc1 $f10, 0x0258($s0) ## 00000258 -/* 03028 80A04C58 444CF800 */ cfc1 $t4, $31 -/* 0302C 80A04C5C 44CDF800 */ ctc1 $t5, $31 -/* 03030 80A04C60 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03034 80A04C64 46005424 */ cvt.w.s $f16, $f10 -/* 03038 80A04C68 444DF800 */ cfc1 $t5, $31 -/* 0303C 80A04C6C 00000000 */ nop -/* 03040 80A04C70 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03044 80A04C74 51A00013 */ beql $t5, $zero, .L80A04CC4 -/* 03048 80A04C78 440D8000 */ mfc1 $t5, $f16 -/* 0304C 80A04C7C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 03050 80A04C80 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03054 80A04C84 46105401 */ sub.s $f16, $f10, $f16 -/* 03058 80A04C88 44CDF800 */ ctc1 $t5, $31 -/* 0305C 80A04C8C 00000000 */ nop -/* 03060 80A04C90 46008424 */ cvt.w.s $f16, $f16 -/* 03064 80A04C94 444DF800 */ cfc1 $t5, $31 -/* 03068 80A04C98 00000000 */ nop -/* 0306C 80A04C9C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03070 80A04CA0 15A00005 */ bne $t5, $zero, .L80A04CB8 -/* 03074 80A04CA4 00000000 */ nop -/* 03078 80A04CA8 440D8000 */ mfc1 $t5, $f16 -/* 0307C 80A04CAC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03080 80A04CB0 10000007 */ beq $zero, $zero, .L80A04CD0 -/* 03084 80A04CB4 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80A04CB8: -/* 03088 80A04CB8 10000005 */ beq $zero, $zero, .L80A04CD0 -/* 0308C 80A04CBC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 03090 80A04CC0 440D8000 */ mfc1 $t5, $f16 -.L80A04CC4: -/* 03094 80A04CC4 00000000 */ nop -/* 03098 80A04CC8 05A0FFFB */ bltz $t5, .L80A04CB8 -/* 0309C 80A04CCC 00000000 */ nop -.L80A04CD0: -/* 030A0 80A04CD0 44CCF800 */ ctc1 $t4, $31 -/* 030A4 80A04CD4 A3AD0031 */ sb $t5, 0x0031($sp) -/* 030A8 80A04CD8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 030AC 80A04CDC C612025C */ lwc1 $f18, 0x025C($s0) ## 0000025C -/* 030B0 80A04CE0 444EF800 */ cfc1 $t6, $31 -/* 030B4 80A04CE4 44CFF800 */ ctc1 $t7, $31 -/* 030B8 80A04CE8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 030BC 80A04CEC 46009124 */ cvt.w.s $f4, $f18 -/* 030C0 80A04CF0 444FF800 */ cfc1 $t7, $31 -/* 030C4 80A04CF4 00000000 */ nop -/* 030C8 80A04CF8 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 030CC 80A04CFC 51E00013 */ beql $t7, $zero, .L80A04D4C -/* 030D0 80A04D00 440F2000 */ mfc1 $t7, $f4 -/* 030D4 80A04D04 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 030D8 80A04D08 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 030DC 80A04D0C 46049101 */ sub.s $f4, $f18, $f4 -/* 030E0 80A04D10 44CFF800 */ ctc1 $t7, $31 -/* 030E4 80A04D14 00000000 */ nop -/* 030E8 80A04D18 46002124 */ cvt.w.s $f4, $f4 -/* 030EC 80A04D1C 444FF800 */ cfc1 $t7, $31 -/* 030F0 80A04D20 00000000 */ nop -/* 030F4 80A04D24 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 030F8 80A04D28 15E00005 */ bne $t7, $zero, .L80A04D40 -/* 030FC 80A04D2C 00000000 */ nop -/* 03100 80A04D30 440F2000 */ mfc1 $t7, $f4 -/* 03104 80A04D34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03108 80A04D38 10000007 */ beq $zero, $zero, .L80A04D58 -/* 0310C 80A04D3C 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80A04D40: -/* 03110 80A04D40 10000005 */ beq $zero, $zero, .L80A04D58 -/* 03114 80A04D44 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 03118 80A04D48 440F2000 */ mfc1 $t7, $f4 -.L80A04D4C: -/* 0311C 80A04D4C 00000000 */ nop -/* 03120 80A04D50 05E0FFFB */ bltz $t7, .L80A04D40 -/* 03124 80A04D54 00000000 */ nop -.L80A04D58: -/* 03128 80A04D58 8FA90050 */ lw $t1, 0x0050($sp) -/* 0312C 80A04D5C 44CEF800 */ ctc1 $t6, $31 -/* 03130 80A04D60 A3AF0032 */ sb $t7, 0x0032($sp) -/* 03134 80A04D64 8FA4004C */ lw $a0, 0x004C($sp) -/* 03138 80A04D68 AFB80010 */ sw $t8, 0x0010($sp) -/* 0313C 80A04D6C AFB90014 */ sw $t9, 0x0014($sp) -/* 03140 80A04D70 AFA80018 */ sw $t0, 0x0018($sp) -/* 03144 80A04D74 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed -/* 03148 80A04D78 AFA9001C */ sw $t1, 0x001C($sp) -/* 0314C 80A04D7C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03150 80A04D80 8FB00028 */ lw $s0, 0x0028($sp) -/* 03154 80A04D84 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 03158 80A04D88 03E00008 */ jr $ra -/* 0315C 80A04D8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s deleted file mode 100644 index 9c7c4d09d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A04D90 -/* 03160 80A04D90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03164 80A04D94 AFB00020 */ sw $s0, 0x0020($sp) -/* 03168 80A04D98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0316C 80A04D9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 03170 80A04DA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 03174 80A04DA4 260F0024 */ addiu $t7, $s0, 0x0024 ## $t7 = 00000024 -/* 03178 80A04DA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0317C 80A04DAC 24A507C0 */ addiu $a1, $a1, 0x07C0 ## $a1 = 000007C0 -/* 03180 80A04DB0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 03184 80A04DB4 26060078 */ addiu $a2, $s0, 0x0078 ## $a2 = 00000078 -/* 03188 80A04DB8 AFB00010 */ sw $s0, 0x0010($sp) -/* 0318C 80A04DBC 0C00F283 */ jal func_8003CA0C -/* 03190 80A04DC0 27A70028 */ addiu $a3, $sp, 0x0028 ## $a3 = FFFFFFF8 -/* 03194 80A04DC4 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 -/* 03198 80A04DC8 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -/* 0319C 80A04DCC A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 031A0 80A04DD0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 031A4 80A04DD4 8FB00020 */ lw $s0, 0x0020($sp) -/* 031A8 80A04DD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 031AC 80A04DDC 03E00008 */ jr $ra -/* 031B0 80A04DE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s deleted file mode 100644 index 4431d1de51..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s +++ /dev/null @@ -1,124 +0,0 @@ -.late_rodata -glabel D_80A06228 - .float 0.2 - -glabel D_80A0622C - .float 8.000000525498763e-05 - -.text -glabel func_80A04DE4 -/* 031B4 80A04DE4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 031B8 80A04DE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 031BC 80A04DEC AFB10020 */ sw $s1, 0x0020($sp) -/* 031C0 80A04DF0 AFB0001C */ sw $s0, 0x001C($sp) -/* 031C4 80A04DF4 948E02C4 */ lhu $t6, 0x02C4($a0) ## 000002C4 -/* 031C8 80A04DF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031CC 80A04DFC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 031D0 80A04E00 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 031D4 80A04E04 11E00031 */ beq $t7, $zero, .L80A04ECC -/* 031D8 80A04E08 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 031DC 80A04E0C 8CA81C90 */ lw $t0, 0x1C90($a1) ## 00001C90 -/* 031E0 80A04E10 27B8002C */ addiu $t8, $sp, 0x002C ## $t8 = FFFFFFE4 -/* 031E4 80A04E14 AF080000 */ sw $t0, 0x0000($t8) ## FFFFFFE4 -/* 031E8 80A04E18 8CB91C94 */ lw $t9, 0x1C94($a1) ## 00001C94 -/* 031EC 80A04E1C AF190004 */ sw $t9, 0x0004($t8) ## FFFFFFE8 -/* 031F0 80A04E20 8CA81C98 */ lw $t0, 0x1C98($a1) ## 00001C98 -/* 031F4 80A04E24 AF080008 */ sw $t0, 0x0008($t8) ## FFFFFFEC -/* 031F8 80A04E28 8C430664 */ lw $v1, 0x0664($v0) ## 00000664 -/* 031FC 80A04E2C 50600006 */ beql $v1, $zero, .L80A04E48 -/* 03200 80A04E30 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 03204 80A04E34 50430004 */ beql $v0, $v1, .L80A04E48 -/* 03208 80A04E38 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 0320C 80A04E3C 5483001A */ bnel $a0, $v1, .L80A04EA8 -/* 03210 80A04E40 27A9002C */ addiu $t1, $sp, 0x002C ## $t1 = FFFFFFE4 -/* 03214 80A04E44 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -.L80A04E48: -/* 03218 80A04E48 0C01DE1C */ jal Math_Sins - ## sins? -/* 0321C 80A04E4C AFA20038 */ sw $v0, 0x0038($sp) -/* 03220 80A04E50 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 03224 80A04E54 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 03228 80A04E58 8FA20038 */ lw $v0, 0x0038($sp) -/* 0322C 80A04E5C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 03230 80A04E60 46040182 */ mul.s $f6, $f0, $f4 -/* 03234 80A04E64 C448095C */ lwc1 $f8, 0x095C($v0) ## 0000095C -/* 03238 80A04E68 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 0323C 80A04E6C 46083280 */ add.s $f10, $f6, $f8 -/* 03240 80A04E70 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 03244 80A04E74 C4500960 */ lwc1 $f16, 0x0960($v0) ## 00000960 -/* 03248 80A04E78 46128100 */ add.s $f4, $f16, $f18 -/* 0324C 80A04E7C E7A40030 */ swc1 $f4, 0x0030($sp) -/* 03250 80A04E80 0C01DE0D */ jal Math_Coss - ## coss? -/* 03254 80A04E84 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 03258 80A04E88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0325C 80A04E8C 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 03260 80A04E90 8FA20038 */ lw $v0, 0x0038($sp) -/* 03264 80A04E94 46060202 */ mul.s $f8, $f0, $f6 -/* 03268 80A04E98 C44A0964 */ lwc1 $f10, 0x0964($v0) ## 00000964 -/* 0326C 80A04E9C 460A4400 */ add.s $f16, $f8, $f10 -/* 03270 80A04EA0 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 03274 80A04EA4 27A9002C */ addiu $t1, $sp, 0x002C ## $t1 = FFFFFFE4 -.L80A04EA8: -/* 03278 80A04EA8 8D2B0000 */ lw $t3, 0x0000($t1) ## FFFFFFE4 -/* 0327C 80A04EAC 960C02C4 */ lhu $t4, 0x02C4($s0) ## 000002C4 -/* 03280 80A04EB0 AE0B0038 */ sw $t3, 0x0038($s0) ## 00000038 -/* 03284 80A04EB4 8D2A0004 */ lw $t2, 0x0004($t1) ## FFFFFFE8 -/* 03288 80A04EB8 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 -/* 0328C 80A04EBC AE0A003C */ sw $t2, 0x003C($s0) ## 0000003C -/* 03290 80A04EC0 8D2B0008 */ lw $t3, 0x0008($t1) ## FFFFFFEC -/* 03294 80A04EC4 A60D02C4 */ sh $t5, 0x02C4($s0) ## 000002C4 -/* 03298 80A04EC8 AE0B0040 */ sw $t3, 0x0040($s0) ## 00000040 -.L80A04ECC: -/* 0329C 80A04ECC 260E0038 */ addiu $t6, $s0, 0x0038 ## $t6 = 00000038 -/* 032A0 80A04ED0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 032A4 80A04ED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032A8 80A04ED8 0C280EAC */ jal func_80A03AB0 -/* 032AC 80A04EDC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 032B0 80A04EE0 8FAF0028 */ lw $t7, 0x0028($sp) -/* 032B4 80A04EE4 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 032B8 80A04EE8 3C0180A0 */ lui $at, %hi(D_80A06228) ## $at = 80A00000 -/* 032BC 80A04EEC 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 -/* 032C0 80A04EF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032C4 80A04EF4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 032C8 80A04EF8 ACB90000 */ sw $t9, 0x0000($a1) ## FFFFFFF4 -/* 032CC 80A04EFC 8DF80004 */ lw $t8, 0x0004($t7) ## 00000004 -/* 032D0 80A04F00 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 032D4 80A04F04 ACB80004 */ sw $t8, 0x0004($a1) ## FFFFFFF8 -/* 032D8 80A04F08 8DF90008 */ lw $t9, 0x0008($t7) ## 00000008 -/* 032DC 80A04F0C ACB90008 */ sw $t9, 0x0008($a1) ## FFFFFFFC -/* 032E0 80A04F10 C4326228 */ lwc1 $f18, %lo(D_80A06228)($at) -/* 032E4 80A04F14 0C280C52 */ jal func_80A03148 -/* 032E8 80A04F18 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 032EC 80A04F1C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 032F0 80A04F20 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 032F4 80A04F24 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 032F8 80A04F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032FC 80A04F2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03300 80A04F30 4604303E */ c.le.s $f6, $f4 -/* 03304 80A04F34 00000000 */ nop -/* 03308 80A04F38 45000003 */ bc1f .L80A04F48 -/* 0330C 80A04F3C 00000000 */ nop -/* 03310 80A04F40 0C28126D */ jal func_80A049B4 -/* 03314 80A04F44 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -.L80A04F48: -/* 03318 80A04F48 3C0180A0 */ lui $at, %hi(D_80A0622C) ## $at = 80A00000 -/* 0331C 80A04F4C C428622C */ lwc1 $f8, %lo(D_80A0622C)($at) -/* 03320 80A04F50 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 -/* 03324 80A04F54 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 03328 80A04F58 3C073A51 */ lui $a3, 0x3A51 ## $a3 = 3A510000 -/* 0332C 80A04F5C 34E7B718 */ ori $a3, $a3, 0xB718 ## $a3 = 3A51B718 -/* 03330 80A04F60 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 03334 80A04F64 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F -/* 03338 80A04F68 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 0333C 80A04F6C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 03340 80A04F70 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 03344 80A04F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03348 80A04F78 0C280ECA */ jal func_80A03B28 -/* 0334C 80A04F7C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03350 80A04F80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03354 80A04F84 8FB0001C */ lw $s0, 0x001C($sp) -/* 03358 80A04F88 8FB10020 */ lw $s1, 0x0020($sp) -/* 0335C 80A04F8C 03E00008 */ jr $ra -/* 03360 80A04F90 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s deleted file mode 100644 index a6e082382d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A04F94 -/* 03364 80A04F94 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03368 80A04F98 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0336C 80A04F9C AFB00020 */ sw $s0, 0x0020($sp) -/* 03370 80A04FA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 03374 80A04FA4 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 03378 80A04FA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0337C 80A04FAC 24180400 */ addiu $t8, $zero, 0x0400 ## $t8 = 00000400 -/* 03380 80A04FB0 AFAF002C */ sw $t7, 0x002C($sp) -/* 03384 80A04FB4 860502BC */ lh $a1, 0x02BC($s0) ## 000002BC -/* 03388 80A04FB8 AFB80010 */ sw $t8, 0x0010($sp) -/* 0338C 80A04FBC 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 03390 80A04FC0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03394 80A04FC4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03398 80A04FC8 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 -/* 0339C 80A04FCC 961902BE */ lhu $t9, 0x02BE($s0) ## 000002BE -/* 033A0 80A04FD0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 033A4 80A04FD4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 033A8 80A04FD8 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 033AC 80A04FDC A60802BE */ sh $t0, 0x02BE($s0) ## 000002BE -/* 033B0 80A04FE0 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 -/* 033B4 80A04FE4 0C01DE80 */ jal Math_ApproxF - -/* 033B8 80A04FE8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 033BC 80A04FEC C60002A4 */ lwc1 $f0, 0x02A4($s0) ## 000002A4 -/* 033C0 80A04FF0 8FA9002C */ lw $t1, 0x002C($sp) -/* 033C4 80A04FF4 3C014443 */ lui $at, 0x4443 ## $at = 44430000 -/* 033C8 80A04FF8 46000102 */ mul.s $f4, $f0, $f0 -/* 033CC 80A04FFC 44814000 */ mtc1 $at, $f8 ## $f8 = 780.00 -/* 033D0 80A05000 C52600EC */ lwc1 $f6, 0x00EC($t1) ## 000000EC -/* 033D4 80A05004 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 033D8 80A05008 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 033DC 80A0500C 46083280 */ add.s $f10, $f6, $f8 -/* 033E0 80A05010 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 033E4 80A05014 44052000 */ mfc1 $a1, $f4 -/* 033E8 80A05018 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 033EC 80A0501C 44065000 */ mfc1 $a2, $f10 -/* 033F0 80A05020 8FA40034 */ lw $a0, 0x0034($sp) -/* 033F4 80A05024 0C01DCEA */ jal func_800773A8 -/* 033F8 80A05028 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 033FC 80A0502C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03400 80A05030 8FB00020 */ lw $s0, 0x0020($sp) -/* 03404 80A05034 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03408 80A05038 03E00008 */ jr $ra -/* 0340C 80A0503C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s deleted file mode 100644 index 59b9b12eef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80A05040 -/* 03410 80A05040 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03414 80A05044 AFBF001C */ sw $ra, 0x001C($sp) -/* 03418 80A05048 AFB10018 */ sw $s1, 0x0018($sp) -/* 0341C 80A0504C AFB00014 */ sw $s0, 0x0014($sp) -/* 03420 80A05050 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03424 80A05054 0C281379 */ jal func_80A04DE4 -/* 03428 80A05058 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0342C 80A0505C 0C042F6F */ jal func_8010BDBC -/* 03430 80A05060 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 03434 80A05064 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03438 80A05068 54410023 */ bnel $v0, $at, .L80A050F8 -/* 0343C 80A0506C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03440 80A05070 0C041AF2 */ jal func_80106BC8 -/* 03444 80A05074 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03448 80A05078 1040001E */ beq $v0, $zero, .L80A050F4 -/* 0344C 80A0507C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 03450 80A05080 00501021 */ addu $v0, $v0, $s0 -/* 03454 80A05084 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 03458 80A05088 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0345C 80A0508C 10400005 */ beq $v0, $zero, .L80A050A4 -/* 03460 80A05090 00000000 */ nop -/* 03464 80A05094 1041000C */ beq $v0, $at, .L80A050C8 -/* 03468 80A05098 00000000 */ nop -/* 0346C 80A0509C 10000016 */ beq $zero, $zero, .L80A050F8 -/* 03470 80A050A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A050A4: -/* 03474 80A050A4 0C01B0AC */ jal ElfMessage_GetSariaText -/* 03478 80A050A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0347C 80A050AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03480 80A050B0 0C042DC8 */ jal func_8010B720 -/* 03484 80A050B4 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 03488 80A050B8 3C0E80A0 */ lui $t6, %hi(func_80A05114) ## $t6 = 80A00000 -/* 0348C 80A050BC 25CE5114 */ addiu $t6, $t6, %lo(func_80A05114) ## $t6 = 80A05114 -/* 03490 80A050C0 1000000C */ beq $zero, $zero, .L80A050F4 -/* 03494 80A050C4 AE2E0130 */ sw $t6, 0x0130($s1) ## 00000130 -.L80A050C8: -/* 03498 80A050C8 0C041B33 */ jal func_80106CCC -/* 0349C 80A050CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034A0 80A050D0 3C0F80A0 */ lui $t7, %hi(func_80A053F0) ## $t7 = 80A00000 -/* 034A4 80A050D4 25EF53F0 */ addiu $t7, $t7, %lo(func_80A053F0) ## $t7 = 80A053F0 -/* 034A8 80A050D8 AE2F0130 */ sw $t7, 0x0130($s1) ## 00000130 -/* 034AC 80A050DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 034B0 80A050E0 0C28070E */ jal func_80A01C38 -/* 034B4 80A050E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 034B8 80A050E8 963802C4 */ lhu $t8, 0x02C4($s1) ## 000002C4 -/* 034BC 80A050EC 3319FFDF */ andi $t9, $t8, 0xFFDF ## $t9 = 00000000 -/* 034C0 80A050F0 A63902C4 */ sh $t9, 0x02C4($s1) ## 000002C4 -.L80A050F4: -/* 034C4 80A050F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A050F8: -/* 034C8 80A050F8 0C2813E5 */ jal func_80A04F94 -/* 034CC 80A050FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 034D0 80A05100 8FBF001C */ lw $ra, 0x001C($sp) -/* 034D4 80A05104 8FB00014 */ lw $s0, 0x0014($sp) -/* 034D8 80A05108 8FB10018 */ lw $s1, 0x0018($sp) -/* 034DC 80A0510C 03E00008 */ jr $ra -/* 034E0 80A05110 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s deleted file mode 100644 index ae59db0543..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A05114 -/* 034E4 80A05114 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 034E8 80A05118 AFBF001C */ sw $ra, 0x001C($sp) -/* 034EC 80A0511C AFB00018 */ sw $s0, 0x0018($sp) -/* 034F0 80A05120 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 034F4 80A05124 0C281379 */ jal func_80A04DE4 -/* 034F8 80A05128 AFA40020 */ sw $a0, 0x0020($sp) -/* 034FC 80A0512C 0C042F6F */ jal func_8010BDBC -/* 03500 80A05130 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 03504 80A05134 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 03508 80A05138 5441000C */ bnel $v0, $at, .L80A0516C -/* 0350C 80A0513C 8FA40020 */ lw $a0, 0x0020($sp) -/* 03510 80A05140 0C041AF2 */ jal func_80106BC8 -/* 03514 80A05144 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03518 80A05148 10400007 */ beq $v0, $zero, .L80A05168 -/* 0351C 80A0514C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03520 80A05150 0C042DC8 */ jal func_8010B720 -/* 03524 80A05154 240500E3 */ addiu $a1, $zero, 0x00E3 ## $a1 = 000000E3 -/* 03528 80A05158 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0352C 80A0515C 3C0E80A0 */ lui $t6, %hi(func_80A05040) ## $t6 = 80A00000 -/* 03530 80A05160 25CE5040 */ addiu $t6, $t6, %lo(func_80A05040) ## $t6 = 80A05040 -/* 03534 80A05164 ADEE0130 */ sw $t6, 0x0130($t7) ## 00000130 -.L80A05168: -/* 03538 80A05168 8FA40020 */ lw $a0, 0x0020($sp) -.L80A0516C: -/* 0353C 80A0516C 0C2813E5 */ jal func_80A04F94 -/* 03540 80A05170 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03544 80A05174 8FBF001C */ lw $ra, 0x001C($sp) -/* 03548 80A05178 8FB00018 */ lw $s0, 0x0018($sp) -/* 0354C 80A0517C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03550 80A05180 03E00008 */ jr $ra -/* 03554 80A05184 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s deleted file mode 100644 index 0ede140826..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A05188 -/* 03558 80A05188 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0355C 80A0518C AFBF001C */ sw $ra, 0x001C($sp) -/* 03560 80A05190 AFB00018 */ sw $s0, 0x0018($sp) -/* 03564 80A05194 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03568 80A05198 0C281379 */ jal func_80A04DE4 -/* 0356C 80A0519C AFA40020 */ sw $a0, 0x0020($sp) -/* 03570 80A051A0 0C042F6F */ jal func_8010BDBC -/* 03574 80A051A4 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 03578 80A051A8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0357C 80A051AC 5441000F */ bnel $v0, $at, .L80A051EC -/* 03580 80A051B0 8FA40020 */ lw $a0, 0x0020($sp) -/* 03584 80A051B4 0C041AF2 */ jal func_80106BC8 -/* 03588 80A051B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0358C 80A051BC 5040000B */ beql $v0, $zero, .L80A051EC -/* 03590 80A051C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 03594 80A051C4 0C01B0AC */ jal ElfMessage_GetSariaText -/* 03598 80A051C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0359C 80A051CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035A0 80A051D0 0C042DC8 */ jal func_8010B720 -/* 035A4 80A051D4 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 035A8 80A051D8 8FAF0020 */ lw $t7, 0x0020($sp) -/* 035AC 80A051DC 3C0E80A0 */ lui $t6, %hi(func_80A05114) ## $t6 = 80A00000 -/* 035B0 80A051E0 25CE5114 */ addiu $t6, $t6, %lo(func_80A05114) ## $t6 = 80A05114 -/* 035B4 80A051E4 ADEE0130 */ sw $t6, 0x0130($t7) ## 00000130 -/* 035B8 80A051E8 8FA40020 */ lw $a0, 0x0020($sp) -.L80A051EC: -/* 035BC 80A051EC 0C2813E5 */ jal func_80A04F94 -/* 035C0 80A051F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 035C4 80A051F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 035C8 80A051F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 035CC 80A051FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 035D0 80A05200 03E00008 */ jr $ra -/* 035D4 80A05204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s deleted file mode 100644 index 97c2c8ca17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80A05208 -/* 035D8 80A05208 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 035DC 80A0520C AFBF001C */ sw $ra, 0x001C($sp) -/* 035E0 80A05210 AFB10018 */ sw $s1, 0x0018($sp) -/* 035E4 80A05214 AFB00014 */ sw $s0, 0x0014($sp) -/* 035E8 80A05218 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 035EC 80A0521C 0C281379 */ jal func_80A04DE4 -/* 035F0 80A05220 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 035F4 80A05224 0C042F6F */ jal func_8010BDBC -/* 035F8 80A05228 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 035FC 80A0522C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03600 80A05230 54410029 */ bnel $v0, $at, .L80A052D8 -/* 03604 80A05234 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03608 80A05238 0C041AF2 */ jal func_80106BC8 -/* 0360C 80A0523C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03610 80A05240 10400024 */ beq $v0, $zero, .L80A052D4 -/* 03614 80A05244 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 03618 80A05248 00501021 */ addu $v0, $v0, $s0 -/* 0361C 80A0524C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 03620 80A05250 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03624 80A05254 10400005 */ beq $v0, $zero, .L80A0526C -/* 03628 80A05258 00000000 */ nop -/* 0362C 80A0525C 10410012 */ beq $v0, $at, .L80A052A8 -/* 03630 80A05260 00000000 */ nop -/* 03634 80A05264 1000001C */ beq $zero, $zero, .L80A052D8 -/* 03638 80A05268 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A0526C: -/* 0363C 80A0526C 0C01B0C6 */ jal ElfMessage_GetCUpText -/* 03640 80A05270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03644 80A05274 10400006 */ beq $v0, $zero, .L80A05290 -/* 03648 80A05278 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0364C 80A0527C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03650 80A05280 0C042DC8 */ jal func_8010B720 -/* 03654 80A05284 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 03658 80A05288 10000003 */ beq $zero, $zero, .L80A05298 -/* 0365C 80A0528C 00000000 */ nop -.L80A05290: -/* 03660 80A05290 0C042DC8 */ jal func_8010B720 -/* 03664 80A05294 2405015F */ addiu $a1, $zero, 0x015F ## $a1 = 0000015F -.L80A05298: -/* 03668 80A05298 3C0E80A0 */ lui $t6, %hi(func_80A052F4) ## $t6 = 80A00000 -/* 0366C 80A0529C 25CE52F4 */ addiu $t6, $t6, %lo(func_80A052F4) ## $t6 = 80A052F4 -/* 03670 80A052A0 1000000C */ beq $zero, $zero, .L80A052D4 -/* 03674 80A052A4 AE2E0130 */ sw $t6, 0x0130($s1) ## 00000130 -.L80A052A8: -/* 03678 80A052A8 0C041B33 */ jal func_80106CCC -/* 0367C 80A052AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03680 80A052B0 3C0F80A0 */ lui $t7, %hi(func_80A053F0) ## $t7 = 80A00000 -/* 03684 80A052B4 25EF53F0 */ addiu $t7, $t7, %lo(func_80A053F0) ## $t7 = 80A053F0 -/* 03688 80A052B8 AE2F0130 */ sw $t7, 0x0130($s1) ## 00000130 -/* 0368C 80A052BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03690 80A052C0 0C28070E */ jal func_80A01C38 -/* 03694 80A052C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03698 80A052C8 963802C4 */ lhu $t8, 0x02C4($s1) ## 000002C4 -/* 0369C 80A052CC 3319FFDF */ andi $t9, $t8, 0xFFDF ## $t9 = 00000000 -/* 036A0 80A052D0 A63902C4 */ sh $t9, 0x02C4($s1) ## 000002C4 -.L80A052D4: -/* 036A4 80A052D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A052D8: -/* 036A8 80A052D8 0C2813E5 */ jal func_80A04F94 -/* 036AC 80A052DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036B0 80A052E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 036B4 80A052E4 8FB00014 */ lw $s0, 0x0014($sp) -/* 036B8 80A052E8 8FB10018 */ lw $s1, 0x0018($sp) -/* 036BC 80A052EC 03E00008 */ jr $ra -/* 036C0 80A052F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s deleted file mode 100644 index f4cf6cba59..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80A052F4 -/* 036C4 80A052F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 036C8 80A052F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 036CC 80A052FC AFB10018 */ sw $s1, 0x0018($sp) -/* 036D0 80A05300 AFB00014 */ sw $s0, 0x0014($sp) -/* 036D4 80A05304 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 036D8 80A05308 0C281379 */ jal func_80A04DE4 -/* 036DC 80A0530C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 036E0 80A05310 0C042F6F */ jal func_8010BDBC -/* 036E4 80A05314 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 036E8 80A05318 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 036EC 80A0531C 14410020 */ bne $v0, $at, .L80A053A0 -/* 036F0 80A05320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036F4 80A05324 0C041AF2 */ jal func_80106BC8 -/* 036F8 80A05328 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 036FC 80A0532C 10400028 */ beq $v0, $zero, .L80A053D0 -/* 03700 80A05330 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 03704 80A05334 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03708 80A05338 00310821 */ addu $at, $at, $s1 -/* 0370C 80A0533C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 03710 80A05340 A42E04CA */ sh $t6, 0x04CA($at) ## 000104CA -/* 03714 80A05344 00511021 */ addu $v0, $v0, $s1 -/* 03718 80A05348 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0371C 80A0534C 3C0F80A0 */ lui $t7, %hi(func_80A05188) ## $t7 = 80A00000 -/* 03720 80A05350 25EF5188 */ addiu $t7, $t7, %lo(func_80A05188) ## $t7 = 80A05188 -/* 03724 80A05354 10400006 */ beq $v0, $zero, .L80A05370 -/* 03728 80A05358 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0372C 80A0535C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03730 80A05360 10410008 */ beq $v0, $at, .L80A05384 -/* 03734 80A05364 3C1880A0 */ lui $t8, %hi(func_80A05208) ## $t8 = 80A00000 -/* 03738 80A05368 1000001A */ beq $zero, $zero, .L80A053D4 -/* 0373C 80A0536C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05370: -/* 03740 80A05370 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 -/* 03744 80A05374 0C042DC8 */ jal func_8010B720 -/* 03748 80A05378 240500E2 */ addiu $a1, $zero, 0x00E2 ## $a1 = 000000E2 -/* 0374C 80A0537C 10000015 */ beq $zero, $zero, .L80A053D4 -/* 03750 80A05380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05384: -/* 03754 80A05384 27185208 */ addiu $t8, $t8, %lo(func_80A05208) ## $t8 = 00005208 -/* 03758 80A05388 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 -/* 0375C 80A0538C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03760 80A05390 0C042DC8 */ jal func_8010B720 -/* 03764 80A05394 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 -/* 03768 80A05398 1000000E */ beq $zero, $zero, .L80A053D4 -/* 0376C 80A0539C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A053A0: -/* 03770 80A053A0 0C00BCCD */ jal func_8002F334 -/* 03774 80A053A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03778 80A053A8 10400009 */ beq $v0, $zero, .L80A053D0 -/* 0377C 80A053AC 3C1980A0 */ lui $t9, %hi(func_80A053F0) ## $t9 = 80A00000 -/* 03780 80A053B0 273953F0 */ addiu $t9, $t9, %lo(func_80A053F0) ## $t9 = 80A053F0 -/* 03784 80A053B4 AE190130 */ sw $t9, 0x0130($s0) ## 00000130 -/* 03788 80A053B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0378C 80A053BC 0C28070E */ jal func_80A01C38 -/* 03790 80A053C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03794 80A053C4 960802C4 */ lhu $t0, 0x02C4($s0) ## 000002C4 -/* 03798 80A053C8 3109FFDF */ andi $t1, $t0, 0xFFDF ## $t1 = 00000000 -/* 0379C 80A053CC A60902C4 */ sh $t1, 0x02C4($s0) ## 000002C4 -.L80A053D0: -/* 037A0 80A053D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A053D4: -/* 037A4 80A053D4 0C2813E5 */ jal func_80A04F94 -/* 037A8 80A053D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 037AC 80A053DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 037B0 80A053E0 8FB00014 */ lw $s0, 0x0014($sp) -/* 037B4 80A053E4 8FB10018 */ lw $s1, 0x0018($sp) -/* 037B8 80A053E8 03E00008 */ jr $ra -/* 037BC 80A053EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s deleted file mode 100644 index 2c27e4698e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s +++ /dev/null @@ -1,216 +0,0 @@ -.rdata -glabel D_80A060D8 - .asciz "../z_en_elf.c" - .balign 4 - -glabel D_80A060E8 - .asciz "z_common_data.memory.information.room_inf[127][ 0 ] = %d\n" - .balign 4 - -.text -glabel func_80A053F0 -/* 037C0 80A053F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 037C4 80A053F4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 037C8 80A053F8 AFB00020 */ sw $s0, 0x0020($sp) -/* 037CC 80A053FC AFA5003C */ sw $a1, 0x003C($sp) -/* 037D0 80A05400 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 037D4 80A05404 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037D8 80A05408 AFAF002C */ sw $t7, 0x002C($sp) -/* 037DC 80A0540C 85E20690 */ lh $v0, 0x0690($t7) ## 00000690 -/* 037E0 80A05410 1440001A */ bne $v0, $zero, .L80A0547C -/* 037E4 80A05414 00000000 */ nop -/* 037E8 80A05418 8DF80664 */ lw $t8, 0x0664($t7) ## 00000664 -/* 037EC 80A0541C 3C028016 */ lui $v0, %hi(gSaveContext+0x38) -/* 037F0 80A05420 5700001D */ bnel $t8, $zero, .L80A05498 -/* 037F4 80A05424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037F8 80A05428 9442E698 */ lhu $v0, %lo(gSaveContext+0x38)($v0) -/* 037FC 80A0542C 3C198016 */ lui $t9, %hi(gGameInfo) -/* 03800 80A05430 28410258 */ slti $at, $v0, 0x0258 -/* 03804 80A05434 14200003 */ bne $at, $zero, .L80A05444 -/* 03808 80A05438 28410BB9 */ slti $at, $v0, 0x0BB9 -/* 0380C 80A0543C 14200005 */ bne $at, $zero, .L80A05454 -/* 03810 80A05440 00000000 */ nop -.L80A05444: -/* 03814 80A05444 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 03818 80A05448 872812C6 */ lh $t0, 0x12C6($t9) ## 801612C6 -/* 0381C 80A0544C 51000012 */ beql $t0, $zero, .L80A05498 -/* 03820 80A05450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05454: -/* 03824 80A05454 0C01B0C6 */ jal ElfMessage_GetCUpText -/* 03828 80A05458 8FA4003C */ lw $a0, 0x003C($sp) -/* 0382C 80A0545C 8FA3002C */ lw $v1, 0x002C($sp) -/* 03830 80A05460 2401015F */ addiu $at, $zero, 0x015F ## $at = 0000015F -/* 03834 80A05464 A4620690 */ sh $v0, 0x0690($v1) ## 00000690 -/* 03838 80A05468 84690690 */ lh $t1, 0x0690($v1) ## 00000690 -/* 0383C 80A0546C 5521000A */ bnel $t1, $at, .L80A05498 -/* 03840 80A05470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03844 80A05474 10000007 */ beq $zero, $zero, .L80A05494 -/* 03848 80A05478 A4600690 */ sh $zero, 0x0690($v1) ## 00000690 -.L80A0547C: -/* 0384C 80A0547C 04430006 */ bgezl $v0, .L80A05498 -/* 03850 80A05480 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03854 80A05484 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 03858 80A05488 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0385C 80A0548C 01415825 */ or $t3, $t2, $at ## $t3 = 00010000 -/* 03860 80A05490 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -.L80A05494: -/* 03864 80A05494 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05498: -/* 03868 80A05498 0C00BC65 */ jal func_8002F194 -/* 0386C 80A0549C 8FA5003C */ lw $a1, 0x003C($sp) -/* 03870 80A054A0 1040002C */ beq $v0, $zero, .L80A05554 -/* 03874 80A054A4 3C048013 */ lui $a0, %hi(D_801333D4) -/* 03878 80A054A8 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 0387C 80A054AC 24056873 */ addiu $a1, $zero, 0x6873 ## $a1 = 00006873 -/* 03880 80A054B0 0C03D149 */ jal func_800F4524 -/* 03884 80A054B4 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 03888 80A054B8 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 -/* 0388C 80A054BC 8E0C0028 */ lw $t4, 0x0028($s0) ## 00000028 -/* 03890 80A054C0 AE0D0038 */ sw $t5, 0x0038($s0) ## 00000038 -/* 03894 80A054C4 8E0D002C */ lw $t5, 0x002C($s0) ## 0000002C -/* 03898 80A054C8 AE0C003C */ sw $t4, 0x003C($s0) ## 0000003C -/* 0389C 80A054CC AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 -/* 038A0 80A054D0 0C01B0C6 */ jal ElfMessage_GetCUpText -/* 038A4 80A054D4 8FA4003C */ lw $a0, 0x003C($sp) -/* 038A8 80A054D8 960E010E */ lhu $t6, 0x010E($s0) ## 0000010E -/* 038AC 80A054DC 3C0C80A0 */ lui $t4, %hi(func_80A052F4) ## $t4 = 80A00000 -/* 038B0 80A054E0 258C52F4 */ addiu $t4, $t4, %lo(func_80A052F4) ## $t4 = 80A052F4 -/* 038B4 80A054E4 15C20007 */ bne $t6, $v0, .L80A05504 -/* 038B8 80A054E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038BC 80A054EC 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 038C0 80A054F0 24190BB9 */ addiu $t9, $zero, 0x0BB9 ## $t9 = 00000BB9 -/* 038C4 80A054F4 3C018016 */ lui $at, %hi(gSaveContext+0x38) -/* 038C8 80A054F8 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 -/* 038CC 80A054FC A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 -/* 038D0 80A05500 A439E698 */ sh $t9, %lo(gSaveContext+0x38)($at) -.L80A05504: -/* 038D4 80A05504 960802C4 */ lhu $t0, 0x02C4($s0) ## 000002C4 -/* 038D8 80A05508 AE0C0130 */ sw $t4, 0x0130($s0) ## 00000130 -/* 038DC 80A0550C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 038E0 80A05510 350A0010 */ ori $t2, $t0, 0x0010 ## $t2 = 00000010 -/* 038E4 80A05514 A60A02C4 */ sh $t2, 0x02C4($s0) ## 000002C4 -/* 038E8 80A05518 354B0020 */ ori $t3, $t2, 0x0020 ## $t3 = 00000030 -/* 038EC 80A0551C 0C28070E */ jal func_80A01C38 -/* 038F0 80A05520 A60B02C4 */ sh $t3, 0x02C4($s0) ## 000002C4 -/* 038F4 80A05524 8E020298 */ lw $v0, 0x0298($s0) ## 00000298 -/* 038F8 80A05528 50400005 */ beql $v0, $zero, .L80A05540 -/* 038FC 80A0552C 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 03900 80A05530 8C4D0004 */ lw $t5, 0x0004($v0) ## 00000004 -/* 03904 80A05534 35AE0100 */ ori $t6, $t5, 0x0100 ## $t6 = 00000100 -/* 03908 80A05538 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0390C 80A0553C 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -.L80A05540: -/* 03910 80A05540 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 03914 80A05544 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 03918 80A05548 01E1C024 */ and $t8, $t7, $at -/* 0391C 80A0554C 10000030 */ beq $zero, $zero, .L80A05610 -/* 03920 80A05550 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -.L80A05554: -/* 03924 80A05554 8E1902CC */ lw $t9, 0x02CC($s0) ## 000002CC -/* 03928 80A05558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0392C 80A0555C 8FA5003C */ lw $a1, 0x003C($sp) -/* 03930 80A05560 0320F809 */ jalr $ra, $t9 -/* 03934 80A05564 00000000 */ nop -/* 03938 80A05568 860802BC */ lh $t0, 0x02BC($s0) ## 000002BC -/* 0393C 80A0556C 3C098016 */ lui $t1, %hi(gSaveContext+0xeb8) -/* 03940 80A05570 3C0A8016 */ lui $t2, %hi(gGameInfo) -/* 03944 80A05574 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 03948 80A05578 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* 0394C 80A0557C 8D29F518 */ lw $t1, %lo(gSaveContext+0xeb8)($t1) -/* 03950 80A05580 3C0B8016 */ lui $t3, %hi(gGameInfo) -/* 03954 80A05584 3C0D8016 */ lui $t5, %hi(gSaveContext+0xeb8) -/* 03958 80A05588 A54912B4 */ sh $t1, 0x12B4($t2) ## 801612B4 -/* 0395C 80A0558C 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) -/* 03960 80A05590 856C12B6 */ lh $t4, 0x12B6($t3) ## 801612B6 -/* 03964 80A05594 1180000D */ beq $t4, $zero, .L80A055CC -/* 03968 80A05598 00000000 */ nop -/* 0396C 80A0559C 8DADF518 */ lw $t5, %lo(gSaveContext+0xeb8)($t5) -/* 03970 80A055A0 3C0480A0 */ lui $a0, %hi(D_80A060D8) ## $a0 = 80A00000 -/* 03974 80A055A4 248460D8 */ addiu $a0, $a0, %lo(D_80A060D8) ## $a0 = 80A060D8 -/* 03978 80A055A8 11A00008 */ beq $t5, $zero, .L80A055CC -/* 0397C 80A055AC 00000000 */ nop -/* 03980 80A055B0 0C000B84 */ jal LogUtils_LogThreadId - -/* 03984 80A055B4 24050A23 */ addiu $a1, $zero, 0x0A23 ## $a1 = 00000A23 -/* 03988 80A055B8 3C0480A0 */ lui $a0, %hi(D_80A060E8) ## $a0 = 80A00000 -/* 0398C 80A055BC 3C058016 */ lui $a1, %hi(gSaveContext+0xeb8) -/* 03990 80A055C0 8CA5F518 */ lw $a1, %lo(gSaveContext+0xeb8)($a1) -/* 03994 80A055C4 0C00084C */ jal osSyncPrintf - -/* 03998 80A055C8 248460E8 */ addiu $a0, $a0, %lo(D_80A060E8) ## $a0 = 80A060E8 -.L80A055CC: -/* 0399C 80A055CC 0C02FF21 */ jal Gameplay_InCsMode -/* 039A0 80A055D0 8FA4003C */ lw $a0, 0x003C($sp) -/* 039A4 80A055D4 1440000E */ bne $v0, $zero, .L80A05610 -/* 039A8 80A055D8 3C028016 */ lui $v0, %hi(gSaveContext+0x38) -/* 039AC 80A055DC 9442E698 */ lhu $v0, %lo(gSaveContext+0x38)($v0) -/* 039B0 80A055E0 284164C8 */ slti $at, $v0, 0x64C8 -/* 039B4 80A055E4 10200004 */ beq $at, $zero, .L80A055F8 -/* 039B8 80A055E8 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 80160001 -/* 039BC 80A055EC 3C018016 */ lui $at, %hi(gSaveContext+0x38) -/* 039C0 80A055F0 10000007 */ beq $zero, $zero, .L80A05610 -/* 039C4 80A055F4 A42EE698 */ sh $t6, %lo(gSaveContext+0x38)($at) -.L80A055F8: -/* 039C8 80A055F8 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 039CC 80A055FC 3C018016 */ lui $at, %hi(gSaveContext+0x38) -/* 039D0 80A05600 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 039D4 80A05604 57000003 */ bnel $t8, $zero, .L80A05614 -/* 039D8 80A05608 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 039DC 80A0560C A420E698 */ sh $zero, %lo(gSaveContext+0x38)($at) -.L80A05610: -/* 039E0 80A05610 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80A05614: -/* 039E4 80A05614 C60402A4 */ lwc1 $f4, 0x02A4($s0) ## 000002A4 -/* 039E8 80A05618 961902BE */ lhu $t9, 0x02BE($s0) ## 000002BE -/* 039EC 80A0561C AE000298 */ sw $zero, 0x0298($s0) ## 00000298 -/* 039F0 80A05620 4604003C */ c.lt.s $f0, $f4 -/* 039F4 80A05624 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 039F8 80A05628 A60802BE */ sh $t0, 0x02BE($s0) ## 000002BE -/* 039FC 80A0562C 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 -/* 03A00 80A05630 45000016 */ bc1f .L80A0568C -/* 03A04 80A05634 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 03A08 80A05638 44050000 */ mfc1 $a1, $f0 -/* 03A0C 80A0563C 0C01DE80 */ jal Math_ApproxF - -/* 03A10 80A05640 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03A14 80A05644 C60002A4 */ lwc1 $f0, 0x02A4($s0) ## 000002A4 -/* 03A18 80A05648 8FA9002C */ lw $t1, 0x002C($sp) -/* 03A1C 80A0564C 3C014443 */ lui $at, 0x4443 ## $at = 44430000 -/* 03A20 80A05650 46000182 */ mul.s $f6, $f0, $f0 -/* 03A24 80A05654 44818000 */ mtc1 $at, $f16 ## $f16 = 780.00 -/* 03A28 80A05658 C52A00EC */ lwc1 $f10, 0x00EC($t1) ## 000000EC -/* 03A2C 80A0565C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 03A30 80A05660 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 03A34 80A05664 46105480 */ add.s $f18, $f10, $f16 -/* 03A38 80A05668 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 03A3C 80A0566C 46003202 */ mul.s $f8, $f6, $f0 -/* 03A40 80A05670 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 03A44 80A05674 44069000 */ mfc1 $a2, $f18 -/* 03A48 80A05678 8FA4003C */ lw $a0, 0x003C($sp) -/* 03A4C 80A0567C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 03A50 80A05680 44054000 */ mfc1 $a1, $f8 -/* 03A54 80A05684 0C01DCEA */ jal func_800773A8 -/* 03A58 80A05688 00000000 */ nop -.L80A0568C: -/* 03A5C 80A0568C 920202C7 */ lbu $v0, 0x02C7($s0) ## 000002C7 -/* 03A60 80A05690 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A64 80A05694 18400003 */ blez $v0, .L80A056A4 -/* 03A68 80A05698 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 03A6C 80A0569C A20A02C7 */ sb $t2, 0x02C7($s0) ## 000002C7 -/* 03A70 80A056A0 314200FF */ andi $v0, $t2, 0x00FF ## $v0 = 000000FF -.L80A056A4: -/* 03A74 80A056A4 14400006 */ bne $v0, $zero, .L80A056C0 -/* 03A78 80A056A8 8FAB003C */ lw $t3, 0x003C($sp) -/* 03A7C 80A056AC 916C1D6C */ lbu $t4, 0x1D6C($t3) ## 00001D6C -/* 03A80 80A056B0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03A84 80A056B4 11800002 */ beq $t4, $zero, .L80A056C0 -/* 03A88 80A056B8 00000000 */ nop -/* 03A8C 80A056BC A20D02C7 */ sb $t5, 0x02C7($s0) ## 000002C7 -.L80A056C0: -/* 03A90 80A056C0 0C281364 */ jal func_80A04D90 -/* 03A94 80A056C4 8FA5003C */ lw $a1, 0x003C($sp) -/* 03A98 80A056C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03A9C 80A056CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 03AA0 80A056D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03AA4 80A056D4 03E00008 */ jr $ra -/* 03AA8 80A056D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s deleted file mode 100644 index 4079ba9763..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s +++ /dev/null @@ -1,90 +0,0 @@ -.late_rodata -glabel D_80A06230 - .float 0.1 - -glabel D_80A06234 - .float 0.012000000104308128 - -glabel D_80A06238 - .float 124.99999237060547 - -.text -glabel func_80A05734 -/* 03B04 80A05734 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03B08 80A05738 AFB00020 */ sw $s0, 0x0020($sp) -/* 03B0C 80A0573C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03B10 80A05740 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03B14 80A05744 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03B18 80A05748 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 03B1C 80A0574C AFA40048 */ sw $a0, 0x0048($sp) -/* 03B20 80A05750 AFA60050 */ sw $a2, 0x0050($sp) -/* 03B24 80A05754 14A1002A */ bne $a1, $at, .L80A05800 -/* 03B28 80A05758 AFA70054 */ sw $a3, 0x0054($sp) -/* 03B2C 80A0575C 8FAE005C */ lw $t6, 0x005C($sp) -/* 03B30 80A05760 95C402BE */ lhu $a0, 0x02BE($t6) ## 000002BE -/* 03B34 80A05764 00042300 */ sll $a0, $a0, 12 -/* 03B38 80A05768 00042400 */ sll $a0, $a0, 16 -/* 03B3C 80A0576C 0C01DE1C */ jal Math_Sins - ## sins? -/* 03B40 80A05770 00042403 */ sra $a0, $a0, 16 -/* 03B44 80A05774 3C0180A0 */ lui $at, %hi(D_80A06230) ## $at = 80A00000 -/* 03B48 80A05778 C4246230 */ lwc1 $f4, %lo(D_80A06230)($at) -/* 03B4C 80A0577C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03B50 80A05780 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 03B54 80A05784 46040182 */ mul.s $f6, $f0, $f4 -/* 03B58 80A05788 3C0180A0 */ lui $at, %hi(D_80A06234) ## $at = 80A00000 -/* 03B5C 80A0578C C4306234 */ lwc1 $f16, %lo(D_80A06234)($at) -/* 03B60 80A05790 8FA2005C */ lw $v0, 0x005C($sp) -/* 03B64 80A05794 3C0180A0 */ lui $at, %hi(D_80A06238) ## $at = 80A00000 -/* 03B68 80A05798 944F02C4 */ lhu $t7, 0x02C4($v0) ## 000002C4 -/* 03B6C 80A0579C 46083280 */ add.s $f10, $f6, $f8 -/* 03B70 80A057A0 31F80200 */ andi $t8, $t7, 0x0200 ## $t8 = 00000000 -/* 03B74 80A057A4 46105082 */ mul.s $f2, $f10, $f16 -/* 03B78 80A057A8 13000002 */ beq $t8, $zero, .L80A057B4 -/* 03B7C 80A057AC 46001506 */ mov.s $f20, $f2 -/* 03B80 80A057B0 46021500 */ add.s $f20, $f2, $f2 -.L80A057B4: -/* 03B84 80A057B4 C4520050 */ lwc1 $f18, 0x0050($v0) ## 00000050 -/* 03B88 80A057B8 C4246238 */ lwc1 $f4, %lo(D_80A06238)($at) -/* 03B8C 80A057BC 3C0480A0 */ lui $a0, %hi(D_80A060A4) ## $a0 = 80A00000 -/* 03B90 80A057C0 248460A4 */ addiu $a0, $a0, %lo(D_80A060A4) ## $a0 = 80A060A4 -/* 03B94 80A057C4 46049182 */ mul.s $f6, $f18, $f4 -/* 03B98 80A057C8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFEC -/* 03B9C 80A057CC 4606A502 */ mul.s $f20, $f20, $f6 -/* 03BA0 80A057D0 0C0346BD */ jal Matrix_MultVec3f -/* 03BA4 80A057D4 00000000 */ nop -/* 03BA8 80A057D8 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 03BAC 80A057DC C7AE0038 */ lwc1 $f14, 0x0038($sp) -/* 03BB0 80A057E0 8FA6003C */ lw $a2, 0x003C($sp) -/* 03BB4 80A057E4 0C034261 */ jal Matrix_Translate -/* 03BB8 80A057E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03BBC 80A057EC 4406A000 */ mfc1 $a2, $f20 -/* 03BC0 80A057F0 4600A306 */ mov.s $f12, $f20 -/* 03BC4 80A057F4 4600A386 */ mov.s $f14, $f20 -/* 03BC8 80A057F8 0C0342A3 */ jal Matrix_Scale -/* 03BCC 80A057FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80A05800: -/* 03BD0 80A05800 8FB9005C */ lw $t9, 0x005C($sp) -/* 03BD4 80A05804 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03BD8 80A05808 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03BDC 80A0580C 972802C4 */ lhu $t0, 0x02C4($t9) ## 000002C4 -/* 03BE0 80A05810 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 03BE4 80A05814 5120000C */ beql $t1, $zero, .L80A05848 -/* 03BE8 80A05818 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03BEC 80A0581C 12010008 */ beq $s0, $at, .L80A05840 -/* 03BF0 80A05820 8FAA0050 */ lw $t2, 0x0050($sp) -/* 03BF4 80A05824 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 03BF8 80A05828 12010005 */ beq $s0, $at, .L80A05840 -/* 03BFC 80A0582C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 03C00 80A05830 12010003 */ beq $s0, $at, .L80A05840 -/* 03C04 80A05834 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 03C08 80A05838 56010003 */ bnel $s0, $at, .L80A05848 -/* 03C0C 80A0583C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A05840: -/* 03C10 80A05840 AD400000 */ sw $zero, 0x0000($t2) ## 00000000 -/* 03C14 80A05844 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A05848: -/* 03C18 80A05848 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 03C1C 80A0584C 8FB00020 */ lw $s0, 0x0020($sp) -/* 03C20 80A05850 03E00008 */ jr $ra -/* 03C24 80A05854 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s deleted file mode 100644 index 7baeb26ecf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80A05F10 -/* 042E0 80A05F10 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 042E4 80A05F14 00067880 */ sll $t7, $a2, 2 -/* 042E8 80A05F18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 042EC 80A05F1C AFA40030 */ sw $a0, 0x0030($sp) -/* 042F0 80A05F20 AFA60038 */ sw $a2, 0x0038($sp) -/* 042F4 80A05F24 00AFC021 */ addu $t8, $a1, $t7 -/* 042F8 80A05F28 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 042FC 80A05F2C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 04300 80A05F30 8C4A0018 */ lw $t2, 0x0018($v0) ## 00000018 -/* 04304 80A05F34 8C59000C */ lw $t9, 0x000C($v0) ## 0000000C -/* 04308 80A05F38 8C480010 */ lw $t0, 0x0010($v0) ## 00000010 -/* 0430C 80A05F3C 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 04310 80A05F40 8C490014 */ lw $t1, 0x0014($v0) ## 00000014 -/* 04314 80A05F44 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 04318 80A05F48 46805420 */ cvt.s.w $f16, $f10 -/* 0431C 80A05F4C 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 04320 80A05F50 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 04324 80A05F54 468020A0 */ cvt.s.w $f2, $f4 -/* 04328 80A05F58 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0432C 80A05F5C 8C4B001C */ lw $t3, 0x001C($v0) ## 0000001C -/* 04330 80A05F60 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 04334 80A05F64 46803320 */ cvt.s.w $f12, $f6 -/* 04338 80A05F68 46809120 */ cvt.s.w $f4, $f18 -/* 0433C 80A05F6C 468043A0 */ cvt.s.w $f14, $f8 -/* 04340 80A05F70 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 04344 80A05F74 8C4C0020 */ lw $t4, 0x0020($v0) ## 00000020 -/* 04348 80A05F78 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 0434C 80A05F7C 00000000 */ nop -/* 04350 80A05F80 46803220 */ cvt.s.w $f8, $f6 -/* 04354 80A05F84 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 04358 80A05F88 94E61D74 */ lhu $a2, 0x1D74($a3) ## 00001D74 -/* 0435C 80A05F8C 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 04360 80A05F90 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 04364 80A05F94 E7AE002C */ swc1 $f14, 0x002C($sp) -/* 04368 80A05F98 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 0436C 80A05F9C 0C01BE4F */ jal func_8006F93C -/* 04370 80A05FA0 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 04374 80A05FA4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 04378 80A05FA8 C7AA0018 */ lwc1 $f10, 0x0018($sp) -/* 0437C 80A05FAC 8FA20030 */ lw $v0, 0x0030($sp) -/* 04380 80A05FB0 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 04384 80A05FB4 46025401 */ sub.s $f16, $f10, $f2 -/* 04388 80A05FB8 C7AE002C */ lwc1 $f14, 0x002C($sp) -/* 0438C 80A05FBC 46008482 */ mul.s $f18, $f16, $f0 -/* 04390 80A05FC0 46029100 */ add.s $f4, $f18, $f2 -/* 04394 80A05FC4 E4440000 */ swc1 $f4, 0x0000($v0) ## 00000000 -/* 04398 80A05FC8 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 0439C 80A05FCC 460C3201 */ sub.s $f8, $f6, $f12 -/* 043A0 80A05FD0 46004282 */ mul.s $f10, $f8, $f0 -/* 043A4 80A05FD4 460C5400 */ add.s $f16, $f10, $f12 -/* 043A8 80A05FD8 E4500004 */ swc1 $f16, 0x0004($v0) ## 00000004 -/* 043AC 80A05FDC C7B20020 */ lwc1 $f18, 0x0020($sp) -/* 043B0 80A05FE0 460E9101 */ sub.s $f4, $f18, $f14 -/* 043B4 80A05FE4 46002182 */ mul.s $f6, $f4, $f0 -/* 043B8 80A05FE8 460E3200 */ add.s $f8, $f6, $f14 -/* 043BC 80A05FEC E4480008 */ swc1 $f8, 0x0008($v0) ## 00000008 -/* 043C0 80A05FF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 043C4 80A05FF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 043C8 80A05FF8 03E00008 */ jr $ra -/* 043CC 80A05FFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s deleted file mode 100644 index 4bbf8d6822..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnNiw_Destroy -/* 00450 80AB5BD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00454 80AB5BD4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00458 80AB5BD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0045C 80AB5BDC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00460 80AB5BE0 0C0170EB */ jal Collider_DestroyCylinder - -/* 00464 80AB5BE4 24C5030C */ addiu $a1, $a2, 0x030C ## $a1 = 0000030C -/* 00468 80AB5BE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0046C 80AB5BEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00470 80AB5BF0 03E00008 */ jr $ra -/* 00474 80AB5BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s deleted file mode 100644 index 45ac23b81e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel EnNiw_Draw -/* 02938 80AB80B8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0293C 80AB80BC 3C0F80AC */ lui $t7, %hi(D_80AB870C) ## $t7 = 80AC0000 -/* 02940 80AB80C0 AFBF002C */ sw $ra, 0x002C($sp) -/* 02944 80AB80C4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02948 80AB80C8 AFA5004C */ sw $a1, 0x004C($sp) -/* 0294C 80AB80CC 25EF870C */ addiu $t7, $t7, %lo(D_80AB870C) ## $t7 = 80AB870C -/* 02950 80AB80D0 8DF90000 */ lw $t9, 0x0000($t7) ## 80AB870C -/* 02954 80AB80D4 27AE0038 */ addiu $t6, $sp, 0x0038 ## $t6 = FFFFFFF0 -/* 02958 80AB80D8 8DF80004 */ lw $t8, 0x0004($t7) ## 80AB8710 -/* 0295C 80AB80DC ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 02960 80AB80E0 8DF90008 */ lw $t9, 0x0008($t7) ## 80AB8714 -/* 02964 80AB80E4 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 02968 80AB80E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0296C 80AB80EC ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 02970 80AB80F0 8FA8004C */ lw $t0, 0x004C($sp) -/* 02974 80AB80F4 0C024F46 */ jal func_80093D18 -/* 02978 80AB80F8 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 0297C 80AB80FC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02980 80AB8100 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 02984 80AB8104 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 02988 80AB8108 3C0980AB */ lui $t1, %hi(func_80AB7F60) ## $t1 = 80AB0000 -/* 0298C 80AB810C 25297F60 */ addiu $t1, $t1, %lo(func_80AB7F60) ## $t1 = 80AB7F60 -/* 02990 80AB8110 AFA90010 */ sw $t1, 0x0010($sp) -/* 02994 80AB8114 AFB00018 */ sw $s0, 0x0018($sp) -/* 02998 80AB8118 AFA00014 */ sw $zero, 0x0014($sp) -/* 0299C 80AB811C 0C0286B2 */ jal SkelAnime_DrawSV -/* 029A0 80AB8120 8FA4004C */ lw $a0, 0x004C($sp) -/* 029A4 80AB8124 8E0B0250 */ lw $t3, 0x0250($s0) ## 00000250 -/* 029A8 80AB8128 3C0A80AB */ lui $t2, %hi(func_80AB6450) ## $t2 = 80AB0000 -/* 029AC 80AB812C 254A6450 */ addiu $t2, $t2, %lo(func_80AB6450) ## $t2 = 80AB6450 -/* 029B0 80AB8130 154B0005 */ bne $t2, $t3, .L80AB8148 -/* 029B4 80AB8134 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 029B8 80AB8138 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFF0 -/* 029BC 80AB813C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029C0 80AB8140 0C00CF0C */ jal func_80033C30 -/* 029C4 80AB8144 8FA7004C */ lw $a3, 0x004C($sp) -.L80AB8148: -/* 029C8 80AB8148 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029CC 80AB814C 0C2AE103 */ jal func_80AB840C -/* 029D0 80AB8150 8FA5004C */ lw $a1, 0x004C($sp) -/* 029D4 80AB8154 8FBF002C */ lw $ra, 0x002C($sp) -/* 029D8 80AB8158 8FB00028 */ lw $s0, 0x0028($sp) -/* 029DC 80AB815C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 029E0 80AB8160 03E00008 */ jr $ra -/* 029E4 80AB8164 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s deleted file mode 100644 index 2a4fb672c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s +++ /dev/null @@ -1,370 +0,0 @@ -.rdata -glabel D_80AB8720 - .asciz "\x1b[33m☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80AB8754 - .asciz "\x1b[33m☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80AB8788 - .asciz "\x1b[33m 通常鶏index %d\n\x1b[m" - .balign 4 - -glabel D_80AB87A4 - .asciz "\x1b[33m☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80AB87D4 - .asciz "\n\n" - .balign 4 - -.late_rodata -glabel D_80AB8A50 - .float 1530.0 - -glabel D_80AB8A54 - .float 3.99 - -glabel jtbl_80AB8A58 - .word L80AB5A44 - .word L80AB5A28 - .word L80AB5A64 - .word L80AB5AE8 - .word L80AB5A84 - .word L80AB5AF4 - .word L80AB5AA4 - .word L80AB5AF4 - .word L80AB5AF4 - .word L80AB5AF4 - .word L80AB5AF4 - .word L80AB5AF4 - .word L80AB5AC4 - .word L80AB5AD0 - -.text -glabel EnNiw_Init -/* 00000 80AB5780 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80AB5784 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00008 80AB5788 AFB20030 */ sw $s2, 0x0030($sp) -/* 0000C 80AB578C AFB1002C */ sw $s1, 0x002C($sp) -/* 00010 80AB5790 AFB00028 */ sw $s0, 0x0028($sp) -/* 00014 80AB5794 AFA50054 */ sw $a1, 0x0054($sp) -/* 00018 80AB5798 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0001C 80AB579C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00020 80AB57A0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00024 80AB57A4 04410003 */ bgez $v0, .L80AB57B4 -/* 00028 80AB57A8 3C0580AC */ lui $a1, %hi(D_80AB86DC) ## $a1 = 80AC0000 -/* 0002C 80AB57AC A480001C */ sh $zero, 0x001C($a0) ## 0000001C -/* 00030 80AB57B0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -.L80AB57B4: -/* 00034 80AB57B4 14410012 */ bne $v0, $at, .L80AB5800 -/* 00038 80AB57B8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0003C 80AB57BC 3C0380AC */ lui $v1, %hi(D_80AB867C) ## $v1 = 80AC0000 -/* 00040 80AB57C0 2463867C */ addiu $v1, $v1, %lo(D_80AB867C) ## $v1 = 80AB867C -/* 00044 80AB57C4 906E0000 */ lbu $t6, 0x0000($v1) ## 80AB867C -/* 00048 80AB57C8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0004C 80AB57CC 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00050 80AB57D0 51C00009 */ beql $t6, $zero, .L80AB57F8 -/* 00054 80AB57D4 A06F0000 */ sb $t7, 0x0000($v1) ## 80AB867C -/* 00058 80AB57D8 0C00B55C */ jal Actor_Kill - -/* 0005C 80AB57DC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00060 80AB57E0 3C0480AC */ lui $a0, %hi(D_80AB8720) ## $a0 = 80AC0000 -/* 00064 80AB57E4 0C00084C */ jal osSyncPrintf - -/* 00068 80AB57E8 24848720 */ addiu $a0, $a0, %lo(D_80AB8720) ## $a0 = 80AB8720 -/* 0006C 80AB57EC 100000F3 */ beq $zero, $zero, .L80AB5BBC -/* 00070 80AB57F0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00074 80AB57F4 A06F0000 */ sb $t7, 0x0000($v1) ## 00000000 -.L80AB57F8: -/* 00078 80AB57F8 8642001C */ lh $v0, 0x001C($s2) ## 0000001C -/* 0007C 80AB57FC A2580003 */ sb $t8, 0x0003($s2) ## 00000003 -.L80AB5800: -/* 00080 80AB5800 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00084 80AB5804 14410010 */ bne $v0, $at, .L80AB5848 -/* 00088 80AB5808 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0008C 80AB580C 3C0280AC */ lui $v0, %hi(D_80AB8680) ## $v0 = 80AC0000 -/* 00090 80AB5810 24428680 */ addiu $v0, $v0, %lo(D_80AB8680) ## $v0 = 80AB8680 -/* 00094 80AB5814 90590000 */ lbu $t9, 0x0000($v0) ## 80AB8680 -/* 00098 80AB5818 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 0009C 80AB581C 53200009 */ beql $t9, $zero, .L80AB5844 -/* 000A0 80AB5820 A0480000 */ sb $t0, 0x0000($v0) ## 80AB8680 -/* 000A4 80AB5824 0C00B55C */ jal Actor_Kill - -/* 000A8 80AB5828 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 000AC 80AB582C 3C0480AC */ lui $a0, %hi(D_80AB8754) ## $a0 = 80AC0000 -/* 000B0 80AB5830 0C00084C */ jal osSyncPrintf - -/* 000B4 80AB5834 24848754 */ addiu $a0, $a0, %lo(D_80AB8754) ## $a0 = 80AB8754 -/* 000B8 80AB5838 100000E0 */ beq $zero, $zero, .L80AB5BBC -/* 000BC 80AB583C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 000C0 80AB5840 A0480000 */ sb $t0, 0x0000($v0) ## 00000000 -.L80AB5844: -/* 000C4 80AB5844 A2490003 */ sb $t1, 0x0003($s2) ## 00000003 -.L80AB5848: -/* 000C8 80AB5848 0C01E037 */ jal Actor_ProcessInitChain - -/* 000CC 80AB584C 24A586DC */ addiu $a1, $a1, %lo(D_80AB86DC) ## $a1 = FFFF86DC -/* 000D0 80AB5850 8E4A0004 */ lw $t2, 0x0004($s2) ## 00000004 -/* 000D4 80AB5854 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 000D8 80AB5858 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 000DC 80AB585C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 000E0 80AB5860 AE4B0004 */ sw $t3, 0x0004($s2) ## 00000004 -/* 000E4 80AB5864 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 -/* 000E8 80AB5868 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 000EC 80AB586C 0C00AC78 */ jal ActorShape_Init - -/* 000F0 80AB5870 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 000F4 80AB5874 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 000F8 80AB5878 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 000FC 80AB587C 264C0190 */ addiu $t4, $s2, 0x0190 ## $t4 = 00000190 -/* 00100 80AB5880 264D01F0 */ addiu $t5, $s2, 0x01F0 ## $t5 = 000001F0 -/* 00104 80AB5884 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 00108 80AB5888 AFAE0018 */ sw $t6, 0x0018($sp) -/* 0010C 80AB588C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00110 80AB5890 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00114 80AB5894 24E700E8 */ addiu $a3, $a3, 0x00E8 ## $a3 = 060000E8 -/* 00118 80AB5898 24C62530 */ addiu $a2, $a2, 0x2530 ## $a2 = 06002530 -/* 0011C 80AB589C 8FA40054 */ lw $a0, 0x0054($sp) -/* 00120 80AB58A0 0C0291BE */ jal SkelAnime_InitSV -/* 00124 80AB58A4 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C -/* 00128 80AB58A8 8FAF0054 */ lw $t7, 0x0054($sp) -/* 0012C 80AB58AC 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 00130 80AB58B0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 00134 80AB58B4 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 -/* 00138 80AB58B8 3C0280AC */ lui $v0, %hi(D_80AB8618) ## $v0 = 80AC0000 -/* 0013C 80AB58BC 17010033 */ bne $t8, $at, .L80AB598C -/* 00140 80AB58C0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00144 80AB58C4 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 00148 80AB58C8 24428618 */ addiu $v0, $v0, %lo(D_80AB8618) ## $v0 = 80AB8618 -.L80AB58CC: -/* 0014C 80AB58CC C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 -/* 00150 80AB58D0 C4460000 */ lwc1 $f6, 0x0000($v0) ## 80AB8618 -/* 00154 80AB58D4 46062001 */ sub.s $f0, $f4, $f6 -/* 00158 80AB58D8 46000005 */ abs.s $f0, $f0 -/* 0015C 80AB58DC 4602003C */ c.lt.s $f0, $f2 -/* 00160 80AB58E0 00000000 */ nop -/* 00164 80AB58E4 45020026 */ bc1fl .L80AB5980 -/* 00168 80AB58E8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0016C 80AB58EC C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C -/* 00170 80AB58F0 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80AB8620 -/* 00174 80AB58F4 3C0880AC */ lui $t0, %hi(D_80AB866C) ## $t0 = 80AC0000 -/* 00178 80AB58F8 2508866C */ addiu $t0, $t0, %lo(D_80AB866C) ## $t0 = 80AB866C -/* 0017C 80AB58FC 460A4001 */ sub.s $f0, $f8, $f10 -/* 00180 80AB5900 3C0480AC */ lui $a0, %hi(D_80AB8788) ## $a0 = 80AC0000 -/* 00184 80AB5904 0010C840 */ sll $t9, $s0, 1 -/* 00188 80AB5908 03288821 */ addu $s1, $t9, $t0 -/* 0018C 80AB590C 46000005 */ abs.s $f0, $f0 -/* 00190 80AB5910 24848788 */ addiu $a0, $a0, %lo(D_80AB8788) ## $a0 = 80AB8788 -/* 00194 80AB5914 4602003C */ c.lt.s $f0, $f2 -/* 00198 80AB5918 00000000 */ nop -/* 0019C 80AB591C 45020018 */ bc1fl .L80AB5980 -/* 001A0 80AB5920 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 -/* 001A4 80AB5924 A65002AA */ sh $s0, 0x02AA($s2) ## 000002AA -/* 001A8 80AB5928 864502AA */ lh $a1, 0x02AA($s2) ## 000002AA -/* 001AC 80AB592C 0C00084C */ jal osSyncPrintf - -/* 001B0 80AB5930 AFA2003C */ sw $v0, 0x003C($sp) -/* 001B4 80AB5934 3C0A8016 */ lui $t2, %hi(gSaveContext+0xf2a) -/* 001B8 80AB5938 954AF58A */ lhu $t2, %lo(gSaveContext+0xf2a)($t2) -/* 001BC 80AB593C 86290000 */ lh $t1, 0x0000($s1) ## 00000000 -/* 001C0 80AB5940 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 001C4 80AB5944 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 001C8 80AB5948 012A5824 */ and $t3, $t1, $t2 -/* 001CC 80AB594C 1160000B */ beq $t3, $zero, .L80AB597C -/* 001D0 80AB5950 8FA2003C */ lw $v0, 0x003C($sp) -/* 001D4 80AB5954 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 001D8 80AB5958 44818000 */ mtc1 $at, $f16 ## $f16 = 300.00 -/* 001DC 80AB595C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 001E0 80AB5960 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 001E4 80AB5964 3C0180AC */ lui $at, %hi(D_80AB8A50) ## $at = 80AC0000 -/* 001E8 80AB5968 E6500024 */ swc1 $f16, 0x0024($s2) ## 00000024 -/* 001EC 80AB596C E6520028 */ swc1 $f18, 0x0028($s2) ## 00000028 -/* 001F0 80AB5970 C4248A50 */ lwc1 $f4, %lo(D_80AB8A50)($at) -/* 001F4 80AB5974 A640001C */ sh $zero, 0x001C($s2) ## 0000001C -/* 001F8 80AB5978 E644002C */ swc1 $f4, 0x002C($s2) ## 0000002C -.L80AB597C: -/* 001FC 80AB597C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000003 -.L80AB5980: -/* 00200 80AB5980 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00204 80AB5984 1601FFD1 */ bne $s0, $at, .L80AB58CC -/* 00208 80AB5988 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = 0000000C -.L80AB598C: -/* 0020C 80AB598C 26500024 */ addiu $s0, $s2, 0x0024 ## $s0 = 00000024 -/* 00210 80AB5990 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 -/* 00214 80AB5994 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00218 80AB5998 264402AC */ addiu $a0, $s2, 0x02AC ## $a0 = 000002AC -/* 0021C 80AB599C 3C118016 */ lui $s1, %hi(gSaveContext) -/* 00220 80AB59A0 2631E660 */ addiu $s1, %lo(gSaveContext) -/* 00224 80AB59A4 264402B8 */ addiu $a0, $s2, 0x02B8 ## $a0 = 000002B8 -/* 00228 80AB59A8 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 0022C 80AB59AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 -/* 00230 80AB59B0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00234 80AB59B4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00238 80AB59B8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0023C 80AB59BC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00240 80AB59C0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00244 80AB59C4 0C00B58B */ jal Actor_SetScale - -/* 00248 80AB59C8 E6460304 */ swc1 $f6, 0x0304($s2) ## 00000304 -/* 0024C 80AB59CC 3C0180AC */ lui $at, %hi(D_80AB8A54) ## $at = 80AC0000 -/* 00250 80AB59D0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00254 80AB59D4 C42C8A54 */ lwc1 $f12, %lo(D_80AB8A54)($at) -/* 00258 80AB59D8 4600020D */ trunc.w.s $f8, $f0 -/* 0025C 80AB59DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00260 80AB59E0 440F4000 */ mfc1 $t7, $f8 -/* 00264 80AB59E4 00000000 */ nop -/* 00268 80AB59E8 25F80005 */ addiu $t8, $t7, 0x0005 ## $t8 = 00000005 -/* 0026C 80AB59EC A65802A4 */ sh $t8, 0x02A4($s2) ## 000002A4 -/* 00270 80AB59F0 865902A4 */ lh $t9, 0x02A4($s2) ## 000002A4 -/* 00274 80AB59F4 07230003 */ bgezl $t9, .L80AB5A04 -/* 00278 80AB59F8 8649001C */ lh $t1, 0x001C($s2) ## 0000001C -/* 0027C 80AB59FC A64802A4 */ sh $t0, 0x02A4($s2) ## 000002A4 -/* 00280 80AB5A00 8649001C */ lh $t1, 0x001C($s2) ## 0000001C -.L80AB5A04: -/* 00284 80AB5A04 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00288 80AB5A08 2D41000E */ sltiu $at, $t2, 0x000E -/* 0028C 80AB5A0C 10200039 */ beq $at, $zero, .L80AB5AF4 -/* 00290 80AB5A10 000A5080 */ sll $t2, $t2, 2 -/* 00294 80AB5A14 3C0180AC */ lui $at, %hi(jtbl_80AB8A58) ## $at = 80AC0000 -/* 00298 80AB5A18 002A0821 */ addu $at, $at, $t2 -/* 0029C 80AB5A1C 8C2A8A58 */ lw $t2, %lo(jtbl_80AB8A58)($at) -/* 002A0 80AB5A20 01400008 */ jr $t2 -/* 002A4 80AB5A24 00000000 */ nop -glabel L80AB5A28 -/* 002A8 80AB5A28 8E2B0010 */ lw $t3, 0x0010($s1) ## 8015E670 -/* 002AC 80AB5A2C 55600032 */ bnel $t3, $zero, .L80AB5AF8 -/* 002B0 80AB5A30 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -/* 002B4 80AB5A34 0C00B55C */ jal Actor_Kill - -/* 002B8 80AB5A38 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 002BC 80AB5A3C 1000002E */ beq $zero, $zero, .L80AB5AF8 -/* 002C0 80AB5A40 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -glabel L80AB5A44 -/* 002C4 80AB5A44 962C0ED6 */ lhu $t4, 0x0ED6($s1) ## 8015F536 -/* 002C8 80AB5A48 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 -/* 002CC 80AB5A4C 51A0002A */ beql $t5, $zero, .L80AB5AF8 -/* 002D0 80AB5A50 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -/* 002D4 80AB5A54 0C00B55C */ jal Actor_Kill - -/* 002D8 80AB5A58 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 002DC 80AB5A5C 10000026 */ beq $zero, $zero, .L80AB5AF8 -/* 002E0 80AB5A60 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -glabel L80AB5A64 -/* 002E4 80AB5A64 962E0ED6 */ lhu $t6, 0x0ED6($s1) ## 8015F536 -/* 002E8 80AB5A68 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 002EC 80AB5A6C 55E00022 */ bnel $t7, $zero, .L80AB5AF8 -/* 002F0 80AB5A70 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -/* 002F4 80AB5A74 0C00B55C */ jal Actor_Kill - -/* 002F8 80AB5A78 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 002FC 80AB5A7C 1000001E */ beq $zero, $zero, .L80AB5AF8 -/* 00300 80AB5A80 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -glabel L80AB5A84 -/* 00304 80AB5A84 96380ED6 */ lhu $t8, 0x0ED6($s1) ## 8015F536 -/* 00308 80AB5A88 33190100 */ andi $t9, $t8, 0x0100 ## $t9 = 00000000 -/* 0030C 80AB5A8C 5320001A */ beql $t9, $zero, .L80AB5AF8 -/* 00310 80AB5A90 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -/* 00314 80AB5A94 0C00B55C */ jal Actor_Kill - -/* 00318 80AB5A98 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0031C 80AB5A9C 10000016 */ beq $zero, $zero, .L80AB5AF8 -/* 00320 80AB5AA0 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -glabel L80AB5AA4 -/* 00324 80AB5AA4 96280ED6 */ lhu $t0, 0x0ED6($s1) ## 8015F536 -/* 00328 80AB5AA8 31090100 */ andi $t1, $t0, 0x0100 ## $t1 = 00000000 -/* 0032C 80AB5AAC 55200012 */ bnel $t1, $zero, .L80AB5AF8 -/* 00330 80AB5AB0 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -/* 00334 80AB5AB4 0C00B55C */ jal Actor_Kill - -/* 00338 80AB5AB8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0033C 80AB5ABC 1000000E */ beq $zero, $zero, .L80AB5AF8 -/* 00340 80AB5AC0 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -glabel L80AB5AC4 -/* 00344 80AB5AC4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00348 80AB5AC8 00000000 */ nop -/* 0034C 80AB5ACC E64A006C */ swc1 $f10, 0x006C($s2) ## 0000006C -glabel L80AB5AD0 -/* 00350 80AB5AD0 8E4A0004 */ lw $t2, 0x0004($s2) ## 00000004 -/* 00354 80AB5AD4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00358 80AB5AD8 A24000AE */ sb $zero, 0x00AE($s2) ## 000000AE -/* 0035C 80AB5ADC 01415824 */ and $t3, $t2, $at -/* 00360 80AB5AE0 10000004 */ beq $zero, $zero, .L80AB5AF4 -/* 00364 80AB5AE4 AE4B0004 */ sw $t3, 0x0004($s2) ## 00000004 -glabel L80AB5AE8 -/* 00368 80AB5AE8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0036C 80AB5AEC 00000000 */ nop -/* 00370 80AB5AF0 E650006C */ swc1 $f16, 0x006C($s2) ## 0000006C -glabel L80AB5AF4 -.L80AB5AF4: -/* 00374 80AB5AF4 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C -.L80AB5AF8: -/* 00378 80AB5AF8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C -/* 0037C 80AB5AFC 0C0170D9 */ jal Collider_InitCylinder - -/* 00380 80AB5B00 8FA40054 */ lw $a0, 0x0054($sp) -/* 00384 80AB5B04 8642001C */ lh $v0, 0x001C($s2) ## 0000001C -/* 00388 80AB5B08 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0038C 80AB5B0C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C -/* 00390 80AB5B10 10410008 */ beq $v0, $at, .L80AB5B34 -/* 00394 80AB5B14 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00398 80AB5B18 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0039C 80AB5B1C 10410007 */ beq $v0, $at, .L80AB5B3C -/* 003A0 80AB5B20 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 003A4 80AB5B24 10410005 */ beq $v0, $at, .L80AB5B3C -/* 003A8 80AB5B28 8FA40054 */ lw $a0, 0x0054($sp) -/* 003AC 80AB5B2C 10000014 */ beq $zero, $zero, .L80AB5B80 -/* 003B0 80AB5B30 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C -.L80AB5B34: -/* 003B4 80AB5B34 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 003B8 80AB5B38 A24C00AE */ sb $t4, 0x00AE($s2) ## 000000AE -.L80AB5B3C: -/* 003BC 80AB5B3C 3C0780AC */ lui $a3, %hi(D_80AB86B0) ## $a3 = 80AC0000 -/* 003C0 80AB5B40 24E786B0 */ addiu $a3, $a3, %lo(D_80AB86B0) ## $a3 = 80AB86B0 -/* 003C4 80AB5B44 0C01712B */ jal Collider_SetCylinder - -/* 003C8 80AB5B48 8FA40054 */ lw $a0, 0x0054($sp) -/* 003CC 80AB5B4C 8FAD0054 */ lw $t5, 0x0054($sp) -/* 003D0 80AB5B50 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 -/* 003D4 80AB5B54 85AE00A4 */ lh $t6, 0x00A4($t5) ## 000000A4 -/* 003D8 80AB5B58 15C1000D */ bne $t6, $at, .L80AB5B90 -/* 003DC 80AB5B5C 00000000 */ nop -/* 003E0 80AB5B60 962F0ED6 */ lhu $t7, 0x0ED6($s1) ## 8015F536 -/* 003E4 80AB5B64 31F84000 */ andi $t8, $t7, 0x4000 ## $t8 = 00000000 -/* 003E8 80AB5B68 17000009 */ bne $t8, $zero, .L80AB5B90 -/* 003EC 80AB5B6C 00000000 */ nop -/* 003F0 80AB5B70 0C00B55C */ jal Actor_Kill - -/* 003F4 80AB5B74 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 003F8 80AB5B78 10000005 */ beq $zero, $zero, .L80AB5B90 -/* 003FC 80AB5B7C 00000000 */ nop -.L80AB5B80: -/* 00400 80AB5B80 3C0780AC */ lui $a3, %hi(D_80AB8684) ## $a3 = 80AC0000 -/* 00404 80AB5B84 24E78684 */ addiu $a3, $a3, %lo(D_80AB8684) ## $a3 = 80AB8684 -/* 00408 80AB5B88 0C01712B */ jal Collider_SetCylinder - -/* 0040C 80AB5B8C 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -.L80AB5B90: -/* 00410 80AB5B90 3C0480AC */ lui $a0, %hi(D_80AB87A4) ## $a0 = 80AC0000 -/* 00414 80AB5B94 248487A4 */ addiu $a0, $a0, %lo(D_80AB87A4) ## $a0 = 80AB87A4 -/* 00418 80AB5B98 0C00084C */ jal osSyncPrintf - -/* 0041C 80AB5B9C 8645001C */ lh $a1, 0x001C($s2) ## 0000001C -/* 00420 80AB5BA0 3C0480AC */ lui $a0, %hi(D_80AB87D4) ## $a0 = 80AC0000 -/* 00424 80AB5BA4 0C00084C */ jal osSyncPrintf - -/* 00428 80AB5BA8 248487D4 */ addiu $a0, $a0, %lo(D_80AB87D4) ## $a0 = 80AB87D4 -/* 0042C 80AB5BAC 3C1980AB */ lui $t9, %hi(func_80AB627C) ## $t9 = 80AB0000 -/* 00430 80AB5BB0 2739627C */ addiu $t9, $t9, %lo(func_80AB627C) ## $t9 = 80AB627C -/* 00434 80AB5BB4 AE590250 */ sw $t9, 0x0250($s2) ## 00000250 -/* 00438 80AB5BB8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AB5BBC: -/* 0043C 80AB5BBC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00440 80AB5BC0 8FB1002C */ lw $s1, 0x002C($sp) -/* 00444 80AB5BC4 8FB20030 */ lw $s2, 0x0030($sp) -/* 00448 80AB5BC8 03E00008 */ jr $ra -/* 0044C 80AB5BCC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s deleted file mode 100644 index 8d6dbf2e76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s +++ /dev/null @@ -1,785 +0,0 @@ -.rdata -glabel D_80AB880C - .asciz "\x1b[32m☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB8838 - .asciz "\x1b[31m☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB8868 - .asciz "\x1b[31m☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB8898 - .asciz "\x1b[31m☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB88C8 - .asciz "\x1b[32m☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB88F8 - .asciz "\x1b[32m☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB8928 - .asciz "\x1b[32m☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB8958 - .asciz "\x1b[33m☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB8988 - .asciz "\x1b[33m☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB89B8 - .asciz "\x1b[33m☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80AB89E8 - .asciz "\n\n" - .balign 4 - -glabel D_80AB89EC - .asciz "\n\n" - .balign 4 - -glabel D_80AB89F0 - .asciz "\x1b[33m☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80AB8A1C - .asciz "\n\n" - .balign 4 - -.late_rodata -glabel D_80AB8B0C - .float -0.15 - -.text -glabel EnNiw_Update -/* 01DB4 80AB7534 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 01DB8 80AB7538 AFBF002C */ sw $ra, 0x002C($sp) -/* 01DBC 80AB753C AFB10028 */ sw $s1, 0x0028($sp) -/* 01DC0 80AB7540 AFB00024 */ sw $s0, 0x0024($sp) -/* 01DC4 80AB7544 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 01DC8 80AB7548 AFA500E4 */ sw $a1, 0x00E4($sp) -/* 01DCC 80AB754C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01DD0 80AB7550 3C1980AC */ lui $t9, %hi(D_80AB86E8) ## $t9 = 80AC0000 -/* 01DD4 80AB7554 273986E8 */ addiu $t9, $t9, %lo(D_80AB86E8) ## $t9 = 80AB86E8 -/* 01DD8 80AB7558 AFAF00D4 */ sw $t7, 0x00D4($sp) -/* 01DDC 80AB755C 8F290000 */ lw $t1, 0x0000($t9) ## 80AB86E8 -/* 01DE0 80AB7560 27B800C4 */ addiu $t8, $sp, 0x00C4 ## $t8 = FFFFFFE4 -/* 01DE4 80AB7564 8F280004 */ lw $t0, 0x0004($t9) ## 80AB86EC -/* 01DE8 80AB7568 AF090000 */ sw $t1, 0x0000($t8) ## FFFFFFE4 -/* 01DEC 80AB756C 8F290008 */ lw $t1, 0x0008($t9) ## 80AB86F0 -/* 01DF0 80AB7570 3C0B80AC */ lui $t3, %hi(D_80AB86F4) ## $t3 = 80AC0000 -/* 01DF4 80AB7574 256B86F4 */ addiu $t3, $t3, %lo(D_80AB86F4) ## $t3 = 80AB86F4 -/* 01DF8 80AB7578 AF080004 */ sw $t0, 0x0004($t8) ## FFFFFFE8 -/* 01DFC 80AB757C AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFEC -/* 01E00 80AB7580 8D6D0000 */ lw $t5, 0x0000($t3) ## 80AB86F4 -/* 01E04 80AB7584 27AA00B8 */ addiu $t2, $sp, 0x00B8 ## $t2 = FFFFFFD8 -/* 01E08 80AB7588 8D6C0004 */ lw $t4, 0x0004($t3) ## 80AB86F8 -/* 01E0C 80AB758C AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFD8 -/* 01E10 80AB7590 8D6D0008 */ lw $t5, 0x0008($t3) ## 80AB86FC -/* 01E14 80AB7594 AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFDC -/* 01E18 80AB7598 3C1880AB */ lui $t8, %hi(func_80AB6570) ## $t8 = 80AB0000 -/* 01E1C 80AB759C AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFE0 -/* 01E20 80AB75A0 848E0294 */ lh $t6, 0x0294($a0) ## 00000294 -/* 01E24 80AB75A4 27186570 */ addiu $t8, $t8, %lo(func_80AB6570) ## $t8 = 80AB6570 -/* 01E28 80AB75A8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01E2C 80AB75AC 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01E30 80AB75B0 A48F0294 */ sh $t7, 0x0294($a0) ## 00000294 -/* 01E34 80AB75B4 AFB8003C */ sw $t8, 0x003C($sp) -/* 01E38 80AB75B8 8C990250 */ lw $t9, 0x0250($a0) ## 00000250 -/* 01E3C 80AB75BC 53190005 */ beql $t8, $t9, .L80AB75D4 -/* 01E40 80AB75C0 862202A6 */ lh $v0, 0x02A6($s1) ## 000002A6 -/* 01E44 80AB75C4 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 01E48 80AB75C8 00000000 */ nop -/* 01E4C 80AB75CC E4940290 */ swc1 $f20, 0x0290($a0) ## 00000290 -/* 01E50 80AB75D0 862202A6 */ lh $v0, 0x02A6($s1) ## 000002A6 -.L80AB75D4: -/* 01E54 80AB75D4 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 01E58 80AB75D8 10400069 */ beq $v0, $zero, .L80AB7780 -/* 01E5C 80AB75DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E60 80AB75E0 14410002 */ bne $v0, $at, .L80AB75EC -/* 01E64 80AB75E4 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -/* 01E68 80AB75E8 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -.L80AB75EC: -/* 01E6C 80AB75EC 18600063 */ blez $v1, .L80AB777C -/* 01E70 80AB75F0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 01E74 80AB75F4 A7A300D0 */ sh $v1, 0x00D0($sp) -/* 01E78 80AB75F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80AB75FC: -/* 01E7C 80AB75FC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 01E80 80AB7600 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01E84 80AB7604 00000000 */ nop -/* 01E88 80AB7608 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 01E8C 80AB760C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01E90 80AB7610 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 01E94 80AB7614 46040180 */ add.s $f6, $f0, $f4 -/* 01E98 80AB7618 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01E9C 80AB761C E7A600AC */ swc1 $f6, 0x00AC($sp) -/* 01EA0 80AB7620 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 -/* 01EA4 80AB7624 C62A0304 */ lwc1 $f10, 0x0304($s1) ## 00000304 -/* 01EA8 80AB7628 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01EAC 80AB762C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 01EB0 80AB7630 460A4400 */ add.s $f16, $f8, $f10 -/* 01EB4 80AB7634 46100480 */ add.s $f18, $f0, $f16 -/* 01EB8 80AB7638 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01EBC 80AB763C E7B200B0 */ swc1 $f18, 0x00B0($sp) -/* 01EC0 80AB7640 C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C -/* 01EC4 80AB7644 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01EC8 80AB7648 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 01ECC 80AB764C 46040180 */ add.s $f6, $f0, $f4 -/* 01ED0 80AB7650 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01ED4 80AB7654 E7A600B4 */ swc1 $f6, 0x00B4($sp) -/* 01ED8 80AB7658 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01EDC 80AB765C 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 01EE0 80AB7660 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01EE4 80AB7664 46080280 */ add.s $f10, $f0, $f8 -/* 01EE8 80AB7668 E7AA008C */ swc1 $f10, 0x008C($sp) -/* 01EEC 80AB766C 862802A6 */ lh $t0, 0x02A6($s1) ## 000002A6 -/* 01EF0 80AB7670 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01EF4 80AB7674 5501000E */ bnel $t0, $at, .L80AB76B0 -/* 01EF8 80AB7678 C6300304 */ lwc1 $f16, 0x0304($s1) ## 00000304 -/* 01EFC 80AB767C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01F00 80AB7680 C6320304 */ lwc1 $f18, 0x0304($s1) ## 00000304 -/* 01F04 80AB7684 C7A400B0 */ lwc1 $f4, 0x00B0($sp) -/* 01F08 80AB7688 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01F0C 80AB768C 46128032 */ c.eq.s $f16, $f18 -/* 01F10 80AB7690 00000000 */ nop -/* 01F14 80AB7694 45030006 */ bc1tl .L80AB76B0 -/* 01F18 80AB7698 C6300304 */ lwc1 $f16, 0x0304($s1) ## 00000304 -/* 01F1C 80AB769C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01F20 80AB76A0 00000000 */ nop -/* 01F24 80AB76A4 46062200 */ add.s $f8, $f4, $f6 -/* 01F28 80AB76A8 E7A800B0 */ swc1 $f8, 0x00B0($sp) -/* 01F2C 80AB76AC C6300304 */ lwc1 $f16, 0x0304($s1) ## 00000304 -.L80AB76B0: -/* 01F30 80AB76B0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01F34 80AB76B4 46105032 */ c.eq.s $f10, $f16 -/* 01F38 80AB76B8 00000000 */ nop -/* 01F3C 80AB76BC 4502000A */ bc1fl .L80AB76E8 -/* 01F40 80AB76C0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01F44 80AB76C4 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 01F48 80AB76C8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01F4C 80AB76CC 00000000 */ nop -/* 01F50 80AB76D0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01F54 80AB76D4 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 01F58 80AB76D8 00000000 */ nop -/* 01F5C 80AB76DC 46120100 */ add.s $f4, $f0, $f18 -/* 01F60 80AB76E0 E7A4008C */ swc1 $f4, 0x008C($sp) -/* 01F64 80AB76E4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80AB76E8: -/* 01F68 80AB76E8 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 01F6C 80AB76EC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01F70 80AB76F0 00000000 */ nop -/* 01F74 80AB76F4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01F78 80AB76F8 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 01F7C 80AB76FC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01F80 80AB7700 E7A000A0 */ swc1 $f0, 0x00A0($sp) -/* 01F84 80AB7704 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01F88 80AB7708 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01F8C 80AB770C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01F90 80AB7710 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 01F94 80AB7714 46060202 */ mul.s $f8, $f0, $f6 -/* 01F98 80AB7718 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01F9C 80AB771C 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 01FA0 80AB7720 460A4400 */ add.s $f16, $f8, $f10 -/* 01FA4 80AB7724 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01FA8 80AB7728 E7B000A4 */ swc1 $f16, 0x00A4($sp) -/* 01FAC 80AB772C 3C0180AC */ lui $at, %hi(D_80AB8B0C) ## $at = 80AC0000 -/* 01FB0 80AB7730 C4328B0C */ lwc1 $f18, %lo(D_80AB8B0C)($at) -/* 01FB4 80AB7734 C7A4008C */ lwc1 $f4, 0x008C($sp) -/* 01FB8 80AB7738 E7A000A8 */ swc1 $f0, 0x00A8($sp) -/* 01FBC 80AB773C E7B40094 */ swc1 $f20, 0x0094($sp) -/* 01FC0 80AB7740 E7B4009C */ swc1 $f20, 0x009C($sp) -/* 01FC4 80AB7744 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01FC8 80AB7748 27A500AC */ addiu $a1, $sp, 0x00AC ## $a1 = FFFFFFCC -/* 01FCC 80AB774C 27A600A0 */ addiu $a2, $sp, 0x00A0 ## $a2 = FFFFFFC0 -/* 01FD0 80AB7750 27A70094 */ addiu $a3, $sp, 0x0094 ## $a3 = FFFFFFB4 -/* 01FD4 80AB7754 E7B20098 */ swc1 $f18, 0x0098($sp) -/* 01FD8 80AB7758 0C2AE05A */ jal func_80AB8168 -/* 01FDC 80AB775C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01FE0 80AB7760 87A900D0 */ lh $t1, 0x00D0($sp) -/* 01FE4 80AB7764 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 01FE8 80AB7768 00108400 */ sll $s0, $s0, 16 -/* 01FEC 80AB776C 00108403 */ sra $s0, $s0, 16 -/* 01FF0 80AB7770 0209082A */ slt $at, $s0, $t1 -/* 01FF4 80AB7774 5420FFA1 */ bnel $at, $zero, .L80AB75FC -/* 01FF8 80AB7778 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80AB777C: -/* 01FFC 80AB777C A62002A6 */ sh $zero, 0x02A6($s1) ## 000002A6 -.L80AB7780: -/* 02000 80AB7780 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02004 80AB7784 0C2AE096 */ jal func_80AB8258 -/* 02008 80AB7788 8FA500E4 */ lw $a1, 0x00E4($sp) -/* 0200C 80AB778C 86220254 */ lh $v0, 0x0254($s1) ## 00000254 -/* 02010 80AB7790 10400002 */ beq $v0, $zero, .L80AB779C -/* 02014 80AB7794 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 02018 80AB7798 A62A0254 */ sh $t2, 0x0254($s1) ## 00000254 -.L80AB779C: -/* 0201C 80AB779C 86220256 */ lh $v0, 0x0256($s1) ## 00000256 -/* 02020 80AB77A0 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 02024 80AB77A4 10400002 */ beq $v0, $zero, .L80AB77B0 -/* 02028 80AB77A8 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 0202C 80AB77AC A62B0256 */ sh $t3, 0x0256($s1) ## 00000256 -.L80AB77B0: -/* 02030 80AB77B0 86220258 */ lh $v0, 0x0258($s1) ## 00000258 -/* 02034 80AB77B4 10400002 */ beq $v0, $zero, .L80AB77C0 -/* 02038 80AB77B8 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF -/* 0203C 80AB77BC A62C0258 */ sh $t4, 0x0258($s1) ## 00000258 -.L80AB77C0: -/* 02040 80AB77C0 8622025A */ lh $v0, 0x025A($s1) ## 0000025A -/* 02044 80AB77C4 10400002 */ beq $v0, $zero, .L80AB77D0 -/* 02048 80AB77C8 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 0204C 80AB77CC A62D025A */ sh $t5, 0x025A($s1) ## 0000025A -.L80AB77D0: -/* 02050 80AB77D0 8622025C */ lh $v0, 0x025C($s1) ## 0000025C -/* 02054 80AB77D4 10400002 */ beq $v0, $zero, .L80AB77E0 -/* 02058 80AB77D8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0205C 80AB77DC A62E025C */ sh $t6, 0x025C($s1) ## 0000025C -.L80AB77E0: -/* 02060 80AB77E0 86220266 */ lh $v0, 0x0266($s1) ## 00000266 -/* 02064 80AB77E4 10400002 */ beq $v0, $zero, .L80AB77F0 -/* 02068 80AB77E8 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 0206C 80AB77EC A62F0266 */ sh $t7, 0x0266($s1) ## 00000266 -.L80AB77F0: -/* 02070 80AB77F0 8622025E */ lh $v0, 0x025E($s1) ## 0000025E -/* 02074 80AB77F4 10400002 */ beq $v0, $zero, .L80AB7800 -/* 02078 80AB77F8 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0207C 80AB77FC A638025E */ sh $t8, 0x025E($s1) ## 0000025E -.L80AB7800: -/* 02080 80AB7800 86220260 */ lh $v0, 0x0260($s1) ## 00000260 -/* 02084 80AB7804 10400002 */ beq $v0, $zero, .L80AB7810 -/* 02088 80AB7808 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 0208C 80AB780C A6390260 */ sh $t9, 0x0260($s1) ## 00000260 -.L80AB7810: -/* 02090 80AB7810 86220262 */ lh $v0, 0x0262($s1) ## 00000262 -/* 02094 80AB7814 10400002 */ beq $v0, $zero, .L80AB7820 -/* 02098 80AB7818 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 0209C 80AB781C A6280262 */ sh $t0, 0x0262($s1) ## 00000262 -.L80AB7820: -/* 020A0 80AB7820 86220264 */ lh $v0, 0x0264($s1) ## 00000264 -/* 020A4 80AB7824 10400002 */ beq $v0, $zero, .L80AB7830 -/* 020A8 80AB7828 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 020AC 80AB782C A6290264 */ sh $t1, 0x0264($s1) ## 00000264 -.L80AB7830: -/* 020B0 80AB7830 86220268 */ lh $v0, 0x0268($s1) ## 00000268 -/* 020B4 80AB7834 10400002 */ beq $v0, $zero, .L80AB7840 -/* 020B8 80AB7838 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 020BC 80AB783C A62A0268 */ sh $t2, 0x0268($s1) ## 00000268 -.L80AB7840: -/* 020C0 80AB7840 8622026A */ lh $v0, 0x026A($s1) ## 0000026A -/* 020C4 80AB7844 10400002 */ beq $v0, $zero, .L80AB7850 -/* 020C8 80AB7848 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 020CC 80AB784C A62B026A */ sh $t3, 0x026A($s1) ## 0000026A -.L80AB7850: -/* 020D0 80AB7850 8A2D0030 */ lwl $t5, 0x0030($s1) ## 00000030 -/* 020D4 80AB7854 9A2D0033 */ lwr $t5, 0x0033($s1) ## 00000033 -/* 020D8 80AB7858 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 020DC 80AB785C 8E390250 */ lw $t9, 0x0250($s1) ## 00000250 -/* 020E0 80AB7860 AA2D00B4 */ swl $t5, 0x00B4($s1) ## 000000B4 -/* 020E4 80AB7864 BA2D00B7 */ swr $t5, 0x00B7($s1) ## 000000B7 -/* 020E8 80AB7868 962D0034 */ lhu $t5, 0x0034($s1) ## 00000034 -/* 020EC 80AB786C E62600C4 */ swc1 $f6, 0x00C4($s1) ## 000000C4 -/* 020F0 80AB7870 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 020F4 80AB7874 A62D00B8 */ sh $t5, 0x00B8($s1) ## 000000B8 -/* 020F8 80AB7878 0320F809 */ jalr $ra, $t9 -/* 020FC 80AB787C 8FA500E4 */ lw $a1, 0x00E4($sp) -/* 02100 80AB7880 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02104 80AB7884 0C00B56E */ jal Actor_SetHeight - -/* 02108 80AB7888 8E250304 */ lw $a1, 0x0304($s1) ## 00000304 -/* 0210C 80AB788C 0C00B638 */ jal Actor_MoveForward - -/* 02110 80AB7890 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02114 80AB7894 8E220250 */ lw $v0, 0x0250($s1) ## 00000250 -/* 02118 80AB7898 3C0E80AB */ lui $t6, %hi(func_80AB6EB4) ## $t6 = 80AB0000 -/* 0211C 80AB789C 25CE6EB4 */ addiu $t6, $t6, %lo(func_80AB6EB4) ## $t6 = 80AB6EB4 -/* 02120 80AB78A0 11C20013 */ beq $t6, $v0, .L80AB78F0 -/* 02124 80AB78A4 3C0F80AB */ lui $t7, %hi(func_80AB6450) ## $t7 = 80AB0000 -/* 02128 80AB78A8 25EF6450 */ addiu $t7, $t7, %lo(func_80AB6450) ## $t7 = 80AB6450 -/* 0212C 80AB78AC 11E20010 */ beq $t7, $v0, .L80AB78F0 -/* 02130 80AB78B0 8FB800E4 */ lw $t8, 0x00E4($sp) -/* 02134 80AB78B4 870800A4 */ lh $t0, 0x00A4($t8) ## 000000A4 -/* 02138 80AB78B8 24010054 */ addiu $at, $zero, 0x0054 ## $at = 00000054 -/* 0213C 80AB78BC 03002025 */ or $a0, $t8, $zero ## $a0 = 00000000 -/* 02140 80AB78C0 1101000B */ beq $t0, $at, .L80AB78F0 -/* 02144 80AB78C4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02148 80AB78C8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0214C 80AB78CC 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 02150 80AB78D0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 02154 80AB78D4 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 02158 80AB78D8 2409001F */ addiu $t1, $zero, 0x001F ## $t1 = 0000001F -/* 0215C 80AB78DC 44060000 */ mfc1 $a2, $f0 -/* 02160 80AB78E0 44070000 */ mfc1 $a3, $f0 -/* 02164 80AB78E4 AFA90014 */ sw $t1, 0x0014($sp) -/* 02168 80AB78E8 0C00B92D */ jal func_8002E4B4 -/* 0216C 80AB78EC E7A80010 */ swc1 $f8, 0x0010($sp) -.L80AB78F0: -/* 02170 80AB78F0 8FAA00E4 */ lw $t2, 0x00E4($sp) -/* 02174 80AB78F4 24010054 */ addiu $at, $zero, 0x0054 ## $at = 00000054 -/* 02178 80AB78F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0217C 80AB78FC 854B00A4 */ lh $t3, 0x00A4($t2) ## 000000A4 -/* 02180 80AB7900 240C001D */ addiu $t4, $zero, 0x001D ## $t4 = 0000001D -/* 02184 80AB7904 01402025 */ or $a0, $t2, $zero ## $a0 = 00000000 -/* 02188 80AB7908 15610009 */ bne $t3, $at, .L80AB7930 -/* 0218C 80AB790C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02190 80AB7910 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 02194 80AB7914 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 02198 80AB7918 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 0219C 80AB791C 44060000 */ mfc1 $a2, $f0 -/* 021A0 80AB7920 44070000 */ mfc1 $a3, $f0 -/* 021A4 80AB7924 AFAC0014 */ sw $t4, 0x0014($sp) -/* 021A8 80AB7928 0C00B92D */ jal func_8002E4B4 -/* 021AC 80AB792C E7AA0010 */ swc1 $f10, 0x0010($sp) -.L80AB7930: -/* 021B0 80AB7930 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 021B4 80AB7934 44818000 */ mtc1 $at, $f16 ## $f16 = -32000.00 -/* 021B8 80AB7938 C6200080 */ lwc1 $f0, 0x0080($s1) ## 00000080 -/* 021BC 80AB793C 3C0146FA */ lui $at, 0x46FA ## $at = 46FA0000 -/* 021C0 80AB7940 3C0480AC */ lui $a0, %hi(D_80AB880C) ## $a0 = 80AC0000 -/* 021C4 80AB7944 4610003E */ c.le.s $f0, $f16 -/* 021C8 80AB7948 00000000 */ nop -/* 021CC 80AB794C 45030008 */ bc1tl .L80AB7970 -/* 021D0 80AB7950 46000121 */ cvt.d.s $f4, $f0 -/* 021D4 80AB7954 44819000 */ mtc1 $at, $f18 ## $f18 = 32000.00 -/* 021D8 80AB7958 00000000 */ nop -/* 021DC 80AB795C 4600903E */ c.le.s $f18, $f0 -/* 021E0 80AB7960 00000000 */ nop -/* 021E4 80AB7964 450200AB */ bc1fl .L80AB7C14 -/* 021E8 80AB7968 96380088 */ lhu $t8, 0x0088($s1) ## 00000088 -/* 021EC 80AB796C 46000121 */ cvt.d.s $f4, $f0 -.L80AB7970: -/* 021F0 80AB7970 2484880C */ addiu $a0, $a0, %lo(D_80AB880C) ## $a0 = 80AB880C -/* 021F4 80AB7974 44072000 */ mfc1 $a3, $f4 -/* 021F8 80AB7978 44062800 */ mfc1 $a2, $f5 -/* 021FC 80AB797C 0C00084C */ jal osSyncPrintf - -/* 02200 80AB7980 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 02204 80AB7984 8FAD00E4 */ lw $t5, 0x00E4($sp) -/* 02208 80AB7988 3C0480AC */ lui $a0, %hi(D_80AB8838) ## $a0 = 80AC0000 -/* 0220C 80AB798C 24848838 */ addiu $a0, $a0, %lo(D_80AB8838) ## $a0 = 80AB8838 -/* 02210 80AB7990 C5A600EC */ lwc1 $f6, 0x00EC($t5) ## 000000EC -/* 02214 80AB7994 C5A800E0 */ lwc1 $f8, 0x00E0($t5) ## 000000E0 -/* 02218 80AB7998 C5AA00F0 */ lwc1 $f10, 0x00F0($t5) ## 000000F0 -/* 0221C 80AB799C C5B000E4 */ lwc1 $f16, 0x00E4($t5) ## 000000E4 -/* 02220 80AB79A0 46083301 */ sub.s $f12, $f6, $f8 -/* 02224 80AB79A4 C5B200F4 */ lwc1 $f18, 0x00F4($t5) ## 000000F4 -/* 02228 80AB79A8 C5A400E8 */ lwc1 $f4, 0x00E8($t5) ## 000000E8 -/* 0222C 80AB79AC 46105081 */ sub.s $f2, $f10, $f16 -/* 02230 80AB79B0 460C6182 */ mul.s $f6, $f12, $f12 -/* 02234 80AB79B4 46049381 */ sub.s $f14, $f18, $f4 -/* 02238 80AB79B8 46021202 */ mul.s $f8, $f2, $f2 -/* 0223C 80AB79BC 46083280 */ add.s $f10, $f6, $f8 -/* 02240 80AB79C0 460E7402 */ mul.s $f16, $f14, $f14 -/* 02244 80AB79C4 46105000 */ add.s $f0, $f10, $f16 -/* 02248 80AB79C8 46000004 */ sqrt.s $f0, $f0 -/* 0224C 80AB79CC 46001483 */ div.s $f18, $f2, $f0 -/* 02250 80AB79D0 E7B20078 */ swc1 $f18, 0x0078($sp) -/* 02254 80AB79D4 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 02258 80AB79D8 460021A1 */ cvt.d.s $f6, $f4 -/* 0225C 80AB79DC 44073000 */ mfc1 $a3, $f6 -/* 02260 80AB79E0 44063800 */ mfc1 $a2, $f7 -/* 02264 80AB79E4 0C00084C */ jal osSyncPrintf - -/* 02268 80AB79E8 00000000 */ nop -/* 0226C 80AB79EC C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 -/* 02270 80AB79F0 3C0480AC */ lui $a0, %hi(D_80AB8868) ## $a0 = 80AC0000 -/* 02274 80AB79F4 24848868 */ addiu $a0, $a0, %lo(D_80AB8868) ## $a0 = 80AB8868 -/* 02278 80AB79F8 460042A1 */ cvt.d.s $f10, $f8 -/* 0227C 80AB79FC 44075000 */ mfc1 $a3, $f10 -/* 02280 80AB7A00 44065800 */ mfc1 $a2, $f11 -/* 02284 80AB7A04 0C00084C */ jal osSyncPrintf - -/* 02288 80AB7A08 00000000 */ nop -/* 0228C 80AB7A0C C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C -/* 02290 80AB7A10 3C0480AC */ lui $a0, %hi(D_80AB8898) ## $a0 = 80AC0000 -/* 02294 80AB7A14 24848898 */ addiu $a0, $a0, %lo(D_80AB8898) ## $a0 = 80AB8898 -/* 02298 80AB7A18 460084A1 */ cvt.d.s $f18, $f16 -/* 0229C 80AB7A1C 44079000 */ mfc1 $a3, $f18 -/* 022A0 80AB7A20 44069800 */ mfc1 $a2, $f19 -/* 022A4 80AB7A24 0C00084C */ jal osSyncPrintf - -/* 022A8 80AB7A28 00000000 */ nop -/* 022AC 80AB7A2C C6240008 */ lwc1 $f4, 0x0008($s1) ## 00000008 -/* 022B0 80AB7A30 3C0480AC */ lui $a0, %hi(D_80AB88C8) ## $a0 = 80AC0000 -/* 022B4 80AB7A34 248488C8 */ addiu $a0, $a0, %lo(D_80AB88C8) ## $a0 = 80AB88C8 -/* 022B8 80AB7A38 460021A1 */ cvt.d.s $f6, $f4 -/* 022BC 80AB7A3C 44073000 */ mfc1 $a3, $f6 -/* 022C0 80AB7A40 44063800 */ mfc1 $a2, $f7 -/* 022C4 80AB7A44 0C00084C */ jal osSyncPrintf - -/* 022C8 80AB7A48 00000000 */ nop -/* 022CC 80AB7A4C C628000C */ lwc1 $f8, 0x000C($s1) ## 0000000C -/* 022D0 80AB7A50 3C0480AC */ lui $a0, %hi(D_80AB88F8) ## $a0 = 80AC0000 -/* 022D4 80AB7A54 248488F8 */ addiu $a0, $a0, %lo(D_80AB88F8) ## $a0 = 80AB88F8 -/* 022D8 80AB7A58 460042A1 */ cvt.d.s $f10, $f8 -/* 022DC 80AB7A5C 44075000 */ mfc1 $a3, $f10 -/* 022E0 80AB7A60 44065800 */ mfc1 $a2, $f11 -/* 022E4 80AB7A64 0C00084C */ jal osSyncPrintf - -/* 022E8 80AB7A68 00000000 */ nop -/* 022EC 80AB7A6C C6300010 */ lwc1 $f16, 0x0010($s1) ## 00000010 -/* 022F0 80AB7A70 3C0480AC */ lui $a0, %hi(D_80AB8928) ## $a0 = 80AC0000 -/* 022F4 80AB7A74 24848928 */ addiu $a0, $a0, %lo(D_80AB8928) ## $a0 = 80AB8928 -/* 022F8 80AB7A78 460084A1 */ cvt.d.s $f18, $f16 -/* 022FC 80AB7A7C 44079000 */ mfc1 $a3, $f18 -/* 02300 80AB7A80 44069800 */ mfc1 $a2, $f19 -/* 02304 80AB7A84 0C00084C */ jal osSyncPrintf - -/* 02308 80AB7A88 00000000 */ nop -/* 0230C 80AB7A8C C6240008 */ lwc1 $f4, 0x0008($s1) ## 00000008 -/* 02310 80AB7A90 C6260010 */ lwc1 $f6, 0x0010($s1) ## 00000010 -/* 02314 80AB7A94 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 02318 80AB7A98 E6240024 */ swc1 $f4, 0x0024($s1) ## 00000024 -/* 0231C 80AB7A9C E626002C */ swc1 $f6, 0x002C($s1) ## 0000002C -/* 02320 80AB7AA0 8FB900E4 */ lw $t9, 0x00E4($sp) -/* 02324 80AB7AA4 C7A80078 */ lwc1 $f8, 0x0078($sp) -/* 02328 80AB7AA8 44815000 */ mtc1 $at, $f10 ## $f10 = 160.00 -/* 0232C 80AB7AAC C620000C */ lwc1 $f0, 0x000C($s1) ## 0000000C -/* 02330 80AB7AB0 C73200E4 */ lwc1 $f18, 0x00E4($t9) ## 000000E4 -/* 02334 80AB7AB4 460A4402 */ mul.s $f16, $f8, $f10 -/* 02338 80AB7AB8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 0233C 80AB7ABC 46120100 */ add.s $f4, $f0, $f18 -/* 02340 80AB7AC0 46102180 */ add.s $f6, $f4, $f16 -/* 02344 80AB7AC4 E6260028 */ swc1 $f6, 0x0028($s1) ## 00000028 -/* 02348 80AB7AC8 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 -/* 0234C 80AB7ACC 4600403C */ c.lt.s $f8, $f0 -/* 02350 80AB7AD0 00000000 */ nop -/* 02354 80AB7AD4 45020006 */ bc1fl .L80AB7AF0 -/* 02358 80AB7AD8 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 0235C 80AB7ADC 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 -/* 02360 80AB7AE0 00000000 */ nop -/* 02364 80AB7AE4 460A0480 */ add.s $f18, $f0, $f10 -/* 02368 80AB7AE8 E6320028 */ swc1 $f18, 0x0028($s1) ## 00000028 -/* 0236C 80AB7AEC C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -.L80AB7AF0: -/* 02370 80AB7AF0 3C0480AC */ lui $a0, %hi(D_80AB8958) ## $a0 = 80AC0000 -/* 02374 80AB7AF4 24848958 */ addiu $a0, $a0, %lo(D_80AB8958) ## $a0 = 80AB8958 -/* 02378 80AB7AF8 46002421 */ cvt.d.s $f16, $f4 -/* 0237C 80AB7AFC 44078000 */ mfc1 $a3, $f16 -/* 02380 80AB7B00 44068800 */ mfc1 $a2, $f17 -/* 02384 80AB7B04 0C00084C */ jal osSyncPrintf - -/* 02388 80AB7B08 00000000 */ nop -/* 0238C 80AB7B0C C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 -/* 02390 80AB7B10 3C0480AC */ lui $a0, %hi(D_80AB8988) ## $a0 = 80AC0000 -/* 02394 80AB7B14 24848988 */ addiu $a0, $a0, %lo(D_80AB8988) ## $a0 = 80AB8988 -/* 02398 80AB7B18 46003221 */ cvt.d.s $f8, $f6 -/* 0239C 80AB7B1C 44074000 */ mfc1 $a3, $f8 -/* 023A0 80AB7B20 44064800 */ mfc1 $a2, $f9 -/* 023A4 80AB7B24 0C00084C */ jal osSyncPrintf - -/* 023A8 80AB7B28 00000000 */ nop -/* 023AC 80AB7B2C C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 023B0 80AB7B30 3C0480AC */ lui $a0, %hi(D_80AB89B8) ## $a0 = 80AC0000 -/* 023B4 80AB7B34 248489B8 */ addiu $a0, $a0, %lo(D_80AB89B8) ## $a0 = 80AB89B8 -/* 023B8 80AB7B38 460054A1 */ cvt.d.s $f18, $f10 -/* 023BC 80AB7B3C 44079000 */ mfc1 $a3, $f18 -/* 023C0 80AB7B40 44069800 */ mfc1 $a2, $f19 -/* 023C4 80AB7B44 0C00084C */ jal osSyncPrintf - -/* 023C8 80AB7B48 00000000 */ nop -/* 023CC 80AB7B4C 3C0480AC */ lui $a0, %hi(D_80AB89E8) ## $a0 = 80AC0000 -/* 023D0 80AB7B50 0C00084C */ jal osSyncPrintf - -/* 023D4 80AB7B54 248489E8 */ addiu $a0, $a0, %lo(D_80AB89E8) ## $a0 = 80AB89E8 -/* 023D8 80AB7B58 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 023DC 80AB7B5C 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 023E0 80AB7B60 E6340068 */ swc1 $f20, 0x0068($s1) ## 00000068 -/* 023E4 80AB7B64 26250008 */ addiu $a1, $s1, 0x0008 ## $a1 = 00000008 -/* 023E8 80AB7B68 E624006C */ swc1 $f4, 0x006C($s1) ## 0000006C -/* 023EC 80AB7B6C AFA5003C */ sw $a1, 0x003C($sp) -/* 023F0 80AB7B70 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 023F4 80AB7B74 262402AC */ addiu $a0, $s1, 0x02AC ## $a0 = 000002AC -/* 023F8 80AB7B78 8FA5003C */ lw $a1, 0x003C($sp) -/* 023FC 80AB7B7C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 02400 80AB7B80 262402B8 */ addiu $a0, $s1, 0x02B8 ## $a0 = 000002B8 -/* 02404 80AB7B84 A62002A2 */ sh $zero, 0x02A2($s1) ## 000002A2 -/* 02408 80AB7B88 862202A2 */ lh $v0, 0x02A2($s1) ## 000002A2 -/* 0240C 80AB7B8C E6340300 */ swc1 $f20, 0x0300($s1) ## 00000300 -/* 02410 80AB7B90 E63402FC */ swc1 $f20, 0x02FC($s1) ## 000002FC -/* 02414 80AB7B94 E63402F8 */ swc1 $f20, 0x02F8($s1) ## 000002F8 -/* 02418 80AB7B98 E63402F4 */ swc1 $f20, 0x02F4($s1) ## 000002F4 -/* 0241C 80AB7B9C E63402F0 */ swc1 $f20, 0x02F0($s1) ## 000002F0 -/* 02420 80AB7BA0 E63402D8 */ swc1 $f20, 0x02D8($s1) ## 000002D8 -/* 02424 80AB7BA4 E63402D4 */ swc1 $f20, 0x02D4($s1) ## 000002D4 -/* 02428 80AB7BA8 E63402D0 */ swc1 $f20, 0x02D0($s1) ## 000002D0 -/* 0242C 80AB7BAC E63402CC */ swc1 $f20, 0x02CC($s1) ## 000002CC -/* 02430 80AB7BB0 E63402C8 */ swc1 $f20, 0x02C8($s1) ## 000002C8 -/* 02434 80AB7BB4 E63402C4 */ swc1 $f20, 0x02C4($s1) ## 000002C4 -/* 02438 80AB7BB8 E63402DC */ swc1 $f20, 0x02DC($s1) ## 000002DC -/* 0243C 80AB7BBC E63402E0 */ swc1 $f20, 0x02E0($s1) ## 000002E0 -/* 02440 80AB7BC0 A62202A0 */ sh $v0, 0x02A0($s1) ## 000002A0 -/* 02444 80AB7BC4 A622029E */ sh $v0, 0x029E($s1) ## 0000029E -/* 02448 80AB7BC8 A62202A6 */ sh $v0, 0x02A6($s1) ## 000002A6 -/* 0244C 80AB7BCC A6220298 */ sh $v0, 0x0298($s1) ## 00000298 -/* 02450 80AB7BD0 A6220294 */ sh $v0, 0x0294($s1) ## 00000294 -/* 02454 80AB7BD4 A62202A8 */ sh $v0, 0x02A8($s1) ## 000002A8 -.L80AB7BD8: -/* 02458 80AB7BD8 00107080 */ sll $t6, $s0, 2 -/* 0245C 80AB7BDC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 02460 80AB7BE0 00108400 */ sll $s0, $s0, 16 -/* 02464 80AB7BE4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 02468 80AB7BE8 00108403 */ sra $s0, $s0, 16 -/* 0246C 80AB7BEC 2A01000A */ slti $at, $s0, 0x000A -/* 02470 80AB7BF0 022E7821 */ addu $t7, $s1, $t6 -/* 02474 80AB7BF4 1420FFF8 */ bne $at, $zero, .L80AB7BD8 -/* 02478 80AB7BF8 E5F0026C */ swc1 $f16, 0x026C($t7) ## 0000026C -/* 0247C 80AB7BFC 3C0880AB */ lui $t0, %hi(func_80AB7420) ## $t0 = 80AB0000 -/* 02480 80AB7C00 25087420 */ addiu $t0, $t0, %lo(func_80AB7420) ## $t0 = 80AB7420 -/* 02484 80AB7C04 A62002A8 */ sh $zero, 0x02A8($s1) ## 000002A8 -/* 02488 80AB7C08 100000CF */ beq $zero, $zero, .L80AB7F48 -/* 0248C 80AB7C0C AE280250 */ sw $t0, 0x0250($s1) ## 00000250 -/* 02490 80AB7C10 96380088 */ lhu $t8, 0x0088($s1) ## 00000088 -.L80AB7C14: -/* 02494 80AB7C14 3C0480AC */ lui $a0, %hi(D_80AB85E0) ## $a0 = 80AC0000 -/* 02498 80AB7C18 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0249C 80AB7C1C 33090020 */ andi $t1, $t8, 0x0020 ## $t1 = 00000000 -/* 024A0 80AB7C20 11200032 */ beq $t1, $zero, .L80AB7CEC -/* 024A4 80AB7C24 248485E0 */ addiu $a0, $a0, %lo(D_80AB85E0) ## $a0 = 80AB85E0 -/* 024A8 80AB7C28 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 024AC 80AB7C2C C6280084 */ lwc1 $f8, 0x0084($s1) ## 00000084 -/* 024B0 80AB7C30 4608303C */ c.lt.s $f6, $f8 -/* 024B4 80AB7C34 00000000 */ nop -/* 024B8 80AB7C38 4502002D */ bc1fl .L80AB7CF0 -/* 024BC 80AB7C3C 848D0000 */ lh $t5, 0x0000($a0) ## 80AB85E0 -/* 024C0 80AB7C40 8E2B0250 */ lw $t3, 0x0250($s1) ## 00000250 -/* 024C4 80AB7C44 3C1080AB */ lui $s0, %hi(func_80AB6F04) ## $s0 = 80AB0000 -/* 024C8 80AB7C48 26106F04 */ addiu $s0, $s0, %lo(func_80AB6F04) ## $s0 = 80AB6F04 -/* 024CC 80AB7C4C 520B0028 */ beql $s0, $t3, .L80AB7CF0 -/* 024D0 80AB7C50 848D0000 */ lh $t5, 0x0000($a0) ## 80AB85E0 -/* 024D4 80AB7C54 8622001C */ lh $v0, 0x001C($s1) ## 0000001C -/* 024D8 80AB7C58 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 024DC 80AB7C5C 10410023 */ beq $v0, $at, .L80AB7CEC -/* 024E0 80AB7C60 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 024E4 80AB7C64 10410021 */ beq $v0, $at, .L80AB7CEC -/* 024E8 80AB7C68 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 024EC 80AB7C6C 1041001F */ beq $v0, $at, .L80AB7CEC -/* 024F0 80AB7C70 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 -/* 024F4 80AB7C74 E6340060 */ swc1 $f20, 0x0060($s1) ## 00000060 -/* 024F8 80AB7C78 E634006C */ swc1 $f20, 0x006C($s1) ## 0000006C -/* 024FC 80AB7C7C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 02500 80AB7C80 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFCC -/* 02504 80AB7C84 C7AA00B0 */ lwc1 $f10, 0x00B0($sp) -/* 02508 80AB7C88 C6320084 */ lwc1 $f18, 0x0084($s1) ## 00000084 -/* 0250C 80AB7C8C 240A001E */ addiu $t2, $zero, 0x001E ## $t2 = 0000001E -/* 02510 80AB7C90 240C0190 */ addiu $t4, $zero, 0x0190 ## $t4 = 00000190 -/* 02514 80AB7C94 46125100 */ add.s $f4, $f10, $f18 -/* 02518 80AB7C98 27A500AC */ addiu $a1, $sp, 0x00AC ## $a1 = FFFFFFCC -/* 0251C 80AB7C9C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02520 80AB7CA0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02524 80AB7CA4 E7A400B0 */ swc1 $f4, 0x00B0($sp) -/* 02528 80AB7CA8 A62A025A */ sh $t2, 0x025A($s1) ## 0000025A -/* 0252C 80AB7CAC AFAC0014 */ sw $t4, 0x0014($sp) -/* 02530 80AB7CB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02534 80AB7CB4 0C00A527 */ jal EffectSsGSplash_Spawn -/* 02538 80AB7CB8 8FA400E4 */ lw $a0, 0x00E4($sp) -/* 0253C 80AB7CBC 3C0480AC */ lui $a0, %hi(D_80AB89EC) ## $a0 = 80AC0000 -/* 02540 80AB7CC0 A620025C */ sh $zero, 0x025C($s1) ## 0000025C -/* 02544 80AB7CC4 0C00084C */ jal osSyncPrintf - -/* 02548 80AB7CC8 248489EC */ addiu $a0, $a0, %lo(D_80AB89EC) ## $a0 = 80AB89EC -/* 0254C 80AB7CCC 3C0480AC */ lui $a0, %hi(D_80AB89F0) ## $a0 = 80AC0000 -/* 02550 80AB7CD0 0C00084C */ jal osSyncPrintf - -/* 02554 80AB7CD4 248489F0 */ addiu $a0, $a0, %lo(D_80AB89F0) ## $a0 = 80AB89F0 -/* 02558 80AB7CD8 3C0480AC */ lui $a0, %hi(D_80AB8A1C) ## $a0 = 80AC0000 -/* 0255C 80AB7CDC 0C00084C */ jal osSyncPrintf - -/* 02560 80AB7CE0 24848A1C */ addiu $a0, $a0, %lo(D_80AB8A1C) ## $a0 = 80AB8A1C -/* 02564 80AB7CE4 10000098 */ beq $zero, $zero, .L80AB7F48 -/* 02568 80AB7CE8 AE300250 */ sw $s0, 0x0250($s1) ## 00000250 -.L80AB7CEC: -/* 0256C 80AB7CEC 848D0000 */ lh $t5, 0x0000($a0) ## 00000000 -.L80AB7CF0: -/* 02570 80AB7CF0 55A00030 */ bnel $t5, $zero, .L80AB7DB4 -/* 02574 80AB7CF4 863802A8 */ lh $t8, 0x02A8($s1) ## 000002A8 -/* 02578 80AB7CF8 863902A4 */ lh $t9, 0x02A4($s1) ## 000002A4 -/* 0257C 80AB7CFC 5F20002D */ bgtzl $t9, .L80AB7DB4 -/* 02580 80AB7D00 863802A8 */ lh $t8, 0x02A8($s1) ## 000002A8 -/* 02584 80AB7D04 8622001C */ lh $v0, 0x001C($s1) ## 0000001C -/* 02588 80AB7D08 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0258C 80AB7D0C 10410028 */ beq $v0, $at, .L80AB7DB0 -/* 02590 80AB7D10 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 02594 80AB7D14 10410026 */ beq $v0, $at, .L80AB7DB0 -/* 02598 80AB7D18 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0259C 80AB7D1C 10410024 */ beq $v0, $at, .L80AB7DB0 -/* 025A0 80AB7D20 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 025A4 80AB7D24 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 025A8 80AB7D28 C6260090 */ lwc1 $f6, 0x0090($s1) ## 00000090 -/* 025AC 80AB7D2C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 025B0 80AB7D30 3C0880AB */ lui $t0, %hi(func_80AB70A0) ## $t0 = 80AB0000 -/* 025B4 80AB7D34 4606803C */ c.lt.s $f16, $f6 -/* 025B8 80AB7D38 A62E025E */ sh $t6, 0x025E($s1) ## 0000025E -/* 025BC 80AB7D3C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 025C0 80AB7D40 240F2710 */ addiu $t7, $zero, 0x2710 ## $t7 = 00002710 -/* 025C4 80AB7D44 4500001A */ bc1f .L80AB7DB0 -/* 025C8 80AB7D48 250870A0 */ addiu $t0, $t0, %lo(func_80AB70A0) ## $t0 = 80AB70A0 -/* 025CC 80AB7D4C A4830000 */ sh $v1, 0x0000($a0) ## 00000000 -/* 025D0 80AB7D50 C6200024 */ lwc1 $f0, 0x0024($s1) ## 00000024 -/* 025D4 80AB7D54 A620029E */ sh $zero, 0x029E($s1) ## 0000029E -/* 025D8 80AB7D58 8622029E */ lh $v0, 0x029E($s1) ## 0000029E -/* 025DC 80AB7D5C E62002B8 */ swc1 $f0, 0x02B8($s1) ## 000002B8 -/* 025E0 80AB7D60 E62002AC */ swc1 $f0, 0x02AC($s1) ## 000002AC -/* 025E4 80AB7D64 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 -/* 025E8 80AB7D68 E6340068 */ swc1 $f20, 0x0068($s1) ## 00000068 -/* 025EC 80AB7D6C E63402FC */ swc1 $f20, 0x02FC($s1) ## 000002FC -/* 025F0 80AB7D70 E62002BC */ swc1 $f0, 0x02BC($s1) ## 000002BC -/* 025F4 80AB7D74 E62002B0 */ swc1 $f0, 0x02B0($s1) ## 000002B0 -/* 025F8 80AB7D78 C620002C */ lwc1 $f0, 0x002C($s1) ## 0000002C -/* 025FC 80AB7D7C E6340300 */ swc1 $f20, 0x0300($s1) ## 00000300 -/* 02600 80AB7D80 E6340288 */ swc1 $f20, 0x0288($s1) ## 00000288 -/* 02604 80AB7D84 E6340280 */ swc1 $f20, 0x0280($s1) ## 00000280 -/* 02608 80AB7D88 E6340284 */ swc1 $f20, 0x0284($s1) ## 00000284 -/* 0260C 80AB7D8C E634028C */ swc1 $f20, 0x028C($s1) ## 0000028C -/* 02610 80AB7D90 A62F0260 */ sh $t7, 0x0260($s1) ## 00000260 -/* 02614 80AB7D94 A62302A8 */ sh $v1, 0x02A8($s1) ## 000002A8 -/* 02618 80AB7D98 AE280250 */ sw $t0, 0x0250($s1) ## 00000250 -/* 0261C 80AB7D9C A622025A */ sh $v0, 0x025A($s1) ## 0000025A -/* 02620 80AB7DA0 A622025C */ sh $v0, 0x025C($s1) ## 0000025C -/* 02624 80AB7DA4 E62002C0 */ swc1 $f0, 0x02C0($s1) ## 000002C0 -/* 02628 80AB7DA8 10000067 */ beq $zero, $zero, .L80AB7F48 -/* 0262C 80AB7DAC E62002B4 */ swc1 $f0, 0x02B4($s1) ## 000002B4 -.L80AB7DB0: -/* 02630 80AB7DB0 863802A8 */ lh $t8, 0x02A8($s1) ## 000002A8 -.L80AB7DB4: -/* 02634 80AB7DB4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02638 80AB7DB8 53000015 */ beql $t8, $zero, .L80AB7E10 -/* 0263C 80AB7DBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02640 80AB7DC0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 02644 80AB7DC4 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 02648 80AB7DC8 C628008C */ lwc1 $f8, 0x008C($s1) ## 0000008C -/* 0264C 80AB7DCC 8FA900D4 */ lw $t1, 0x00D4($sp) -/* 02650 80AB7DD0 46125102 */ mul.s $f4, $f10, $f18 -/* 02654 80AB7DD4 4604403C */ c.lt.s $f8, $f4 -/* 02658 80AB7DD8 00000000 */ nop -/* 0265C 80AB7DDC 4502000C */ bc1fl .L80AB7E10 -/* 02660 80AB7DE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02664 80AB7DE4 812B0A78 */ lb $t3, 0x0A78($t1) ## 00000A78 -/* 02668 80AB7DE8 8FA400E4 */ lw $a0, 0x00E4($sp) -/* 0266C 80AB7DEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02670 80AB7DF0 15600006 */ bne $t3, $zero, .L80AB7E0C -/* 02674 80AB7DF4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 02678 80AB7DF8 86270032 */ lh $a3, 0x0032($s1) ## 00000032 -/* 0267C 80AB7DFC 240A0010 */ addiu $t2, $zero, 0x0010 ## $t2 = 00000010 -/* 02680 80AB7E00 AFAA0014 */ sw $t2, 0x0014($sp) -/* 02684 80AB7E04 0C00BDB5 */ jal func_8002F6D4 -/* 02688 80AB7E08 E7B40010 */ swc1 $f20, 0x0010($sp) -.L80AB7E0C: -/* 0268C 80AB7E0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AB7E10: -/* 02690 80AB7E10 0C2ADD1F */ jal func_80AB747C -/* 02694 80AB7E14 8FA500E4 */ lw $a1, 0x00E4($sp) -/* 02698 80AB7E18 862C0262 */ lh $t4, 0x0262($s1) ## 00000262 -/* 0269C 80AB7E1C 5580000B */ bnel $t4, $zero, .L80AB7E4C -/* 026A0 80AB7E20 862F0260 */ lh $t7, 0x0260($s1) ## 00000260 -/* 026A4 80AB7E24 8E390250 */ lw $t9, 0x0250($s1) ## 00000250 -/* 026A8 80AB7E28 3C0D80AB */ lui $t5, %hi(func_80AB6BF8) ## $t5 = 80AB0000 -/* 026AC 80AB7E2C 25AD6BF8 */ addiu $t5, $t5, %lo(func_80AB6BF8) ## $t5 = 80AB6BF8 -/* 026B0 80AB7E30 15B90005 */ bne $t5, $t9, .L80AB7E48 -/* 026B4 80AB7E34 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 026B8 80AB7E38 A62E0262 */ sh $t6, 0x0262($s1) ## 00000262 -/* 026BC 80AB7E3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 026C0 80AB7E40 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 026C4 80AB7E44 240538FF */ addiu $a1, $zero, 0x38FF ## $a1 = 000038FF -.L80AB7E48: -/* 026C8 80AB7E48 862F0260 */ lh $t7, 0x0260($s1) ## 00000260 -.L80AB7E4C: -/* 026CC 80AB7E4C 8FA8003C */ lw $t0, 0x003C($sp) -/* 026D0 80AB7E50 55E00010 */ bnel $t7, $zero, .L80AB7E94 -/* 026D4 80AB7E54 862A02A8 */ lh $t2, 0x02A8($s1) ## 000002A8 -/* 026D8 80AB7E58 8E380250 */ lw $t8, 0x0250($s1) ## 00000250 -/* 026DC 80AB7E5C 240B012C */ addiu $t3, $zero, 0x012C ## $t3 = 0000012C -/* 026E0 80AB7E60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 026E4 80AB7E64 11180008 */ beq $t0, $t8, .L80AB7E88 -/* 026E8 80AB7E68 24052811 */ addiu $a1, $zero, 0x2811 ## $a1 = 00002811 -/* 026EC 80AB7E6C 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 026F0 80AB7E70 A6290260 */ sh $t1, 0x0260($s1) ## 00000260 -/* 026F4 80AB7E74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 026F8 80AB7E78 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 026FC 80AB7E7C 24052812 */ addiu $a1, $zero, 0x2812 ## $a1 = 00002812 -/* 02700 80AB7E80 10000004 */ beq $zero, $zero, .L80AB7E94 -/* 02704 80AB7E84 862A02A8 */ lh $t2, 0x02A8($s1) ## 000002A8 -.L80AB7E88: -/* 02708 80AB7E88 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0270C 80AB7E8C A62B0260 */ sh $t3, 0x0260($s1) ## 00000260 -/* 02710 80AB7E90 862A02A8 */ lh $t2, 0x02A8($s1) ## 000002A8 -.L80AB7E94: -/* 02714 80AB7E94 2630030C */ addiu $s0, $s1, 0x030C ## $s0 = 0000030C -/* 02718 80AB7E98 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C -/* 0271C 80AB7E9C 1540002A */ bne $t2, $zero, .L80AB7F48 -/* 02720 80AB7EA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02724 80AB7EA4 3C0C80AB */ lui $t4, %hi(func_80AB6BF8) ## $t4 = 80AB0000 -/* 02728 80AB7EA8 258C6BF8 */ addiu $t4, $t4, %lo(func_80AB6BF8) ## $t4 = 80AB6BF8 -/* 0272C 80AB7EAC 0C0189B7 */ jal Collider_CylinderUpdate - -/* 02730 80AB7EB0 AFAC003C */ sw $t4, 0x003C($sp) -/* 02734 80AB7EB4 8622001C */ lh $v0, 0x001C($s1) ## 0000001C -/* 02738 80AB7EB8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0273C 80AB7EBC 1041000C */ beq $v0, $at, .L80AB7EF0 -/* 02740 80AB7EC0 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 02744 80AB7EC4 1041000A */ beq $v0, $at, .L80AB7EF0 -/* 02748 80AB7EC8 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 0274C 80AB7ECC 10410008 */ beq $v0, $at, .L80AB7EF0 -/* 02750 80AB7ED0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02754 80AB7ED4 10410006 */ beq $v0, $at, .L80AB7EF0 -/* 02758 80AB7ED8 8FA400E4 */ lw $a0, 0x00E4($sp) -/* 0275C 80AB7EDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02760 80AB7EE0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02764 80AB7EE4 00812821 */ addu $a1, $a0, $at -/* 02768 80AB7EE8 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 0276C 80AB7EEC 02003025 */ or $a2, $s0, $zero ## $a2 = 0000030C -.L80AB7EF0: -/* 02770 80AB7EF0 8E220250 */ lw $v0, 0x0250($s1) ## 00000250 -/* 02774 80AB7EF4 8FB9003C */ lw $t9, 0x003C($sp) -/* 02778 80AB7EF8 3C0E80AB */ lui $t6, %hi(func_80AB6D08) ## $t6 = 80AB0000 -/* 0277C 80AB7EFC 25CE6D08 */ addiu $t6, $t6, %lo(func_80AB6D08) ## $t6 = 80AB6D08 -/* 02780 80AB7F00 53220012 */ beql $t9, $v0, .L80AB7F4C -/* 02784 80AB7F04 8FBF002C */ lw $ra, 0x002C($sp) -/* 02788 80AB7F08 11C2000F */ beq $t6, $v0, .L80AB7F48 -/* 0278C 80AB7F0C 3C0F80AB */ lui $t7, %hi(func_80AB6324) ## $t7 = 80AB0000 -/* 02790 80AB7F10 25EF6324 */ addiu $t7, $t7, %lo(func_80AB6324) ## $t7 = 80AB6324 -/* 02794 80AB7F14 11E2000C */ beq $t7, $v0, .L80AB7F48 -/* 02798 80AB7F18 3C0880AB */ lui $t0, %hi(func_80AB63A8) ## $t0 = 80AB0000 -/* 0279C 80AB7F1C 250863A8 */ addiu $t0, $t0, %lo(func_80AB63A8) ## $t0 = 80AB63A8 -/* 027A0 80AB7F20 11020009 */ beq $t0, $v0, .L80AB7F48 -/* 027A4 80AB7F24 3C1880AB */ lui $t8, %hi(func_80AB6450) ## $t8 = 80AB0000 -/* 027A8 80AB7F28 27186450 */ addiu $t8, $t8, %lo(func_80AB6450) ## $t8 = 80AB6450 -/* 027AC 80AB7F2C 13020006 */ beq $t8, $v0, .L80AB7F48 -/* 027B0 80AB7F30 8FA400E4 */ lw $a0, 0x00E4($sp) -/* 027B4 80AB7F34 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 027B8 80AB7F38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 027BC 80AB7F3C 00812821 */ addu $a1, $a0, $at -/* 027C0 80AB7F40 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 027C4 80AB7F44 02003025 */ or $a2, $s0, $zero ## $a2 = 0000030C -.L80AB7F48: -/* 027C8 80AB7F48 8FBF002C */ lw $ra, 0x002C($sp) -.L80AB7F4C: -/* 027CC 80AB7F4C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 027D0 80AB7F50 8FB00024 */ lw $s0, 0x0024($sp) -/* 027D4 80AB7F54 8FB10028 */ lw $s1, 0x0028($sp) -/* 027D8 80AB7F58 03E00008 */ jr $ra -/* 027DC 80AB7F5C 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s deleted file mode 100644 index ff71b04805..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s +++ /dev/null @@ -1,305 +0,0 @@ -.late_rodata -glabel D_80AB8A90 - .float -10000.0 - -glabel jtbl_80AB8A94 - .word L80AB5D08 - .word L80AB5D14 - .word L80AB5D44 - .word L80AB5DA4 - .word L80AB5DD8 - .word L80AB5DE4 - -glabel D_80AB8AAC - .float 7000.0 - -glabel D_80AB8AB0 - .float 25000.0 - -glabel D_80AB8AB4 - .float 6000.0 - -glabel D_80AB8AB8 - .float -10000.0 - -glabel D_80AB8ABC - .float -10000.0 - -glabel D_80AB8AC0 - .float 10000.0 - -glabel D_80AB8AC4 - .float 3000.0 - -glabel D_80AB8AC8 - .float 14000.0 - -glabel D_80AB8ACC - .float 10000.0 - -.text -glabel func_80AB5BF8 -/* 00478 80AB5BF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0047C 80AB5BFC AFBF001C */ sw $ra, 0x001C($sp) -/* 00480 80AB5C00 AFB00018 */ sw $s0, 0x0018($sp) -/* 00484 80AB5C04 AFA5002C */ sw $a1, 0x002C($sp) -/* 00488 80AB5C08 AFA60030 */ sw $a2, 0x0030($sp) -/* 0048C 80AB5C0C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00490 80AB5C10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00494 80AB5C14 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00498 80AB5C18 00063400 */ sll $a2, $a2, 16 -/* 0049C 80AB5C1C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 004A0 80AB5C20 00063403 */ sra $a2, $a2, 16 -/* 004A4 80AB5C24 15C10004 */ bne $t6, $at, .L80AB5C38 -/* 004A8 80AB5C28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004AC 80AB5C2C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 004B0 80AB5C30 44811000 */ mtc1 $at, $f2 ## $f2 = 2.00 -/* 004B4 80AB5C34 00000000 */ nop -.L80AB5C38: -/* 004B8 80AB5C38 860F0254 */ lh $t7, 0x0254($s0) ## 00000254 -/* 004BC 80AB5C3C 55E00021 */ bnel $t7, $zero, .L80AB5CC4 -/* 004C0 80AB5C40 860D0256 */ lh $t5, 0x0256($s0) ## 00000256 -/* 004C4 80AB5C44 14C00004 */ bne $a2, $zero, .L80AB5C58 -/* 004C8 80AB5C48 3C0180AC */ lui $at, %hi(D_80AB8A90) ## $at = 80AC0000 -/* 004CC 80AB5C4C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 004D0 80AB5C50 10000005 */ beq $zero, $zero, .L80AB5C68 -/* 004D4 80AB5C54 E60E026C */ swc1 $f14, 0x026C($s0) ## 0000026C -.L80AB5C58: -/* 004D8 80AB5C58 C4248A90 */ lwc1 $f4, %lo(D_80AB8A90)($at) -/* 004DC 80AB5C5C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 004E0 80AB5C60 46022182 */ mul.s $f6, $f4, $f2 -/* 004E4 80AB5C64 E606026C */ swc1 $f6, 0x026C($s0) ## 0000026C -.L80AB5C68: -/* 004E8 80AB5C68 86180298 */ lh $t8, 0x0298($s0) ## 00000298 -/* 004EC 80AB5C6C 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 004F0 80AB5C70 A6080254 */ sh $t0, 0x0254($s0) ## 00000254 -/* 004F4 80AB5C74 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 004F8 80AB5C78 A6190298 */ sh $t9, 0x0298($s0) ## 00000298 -/* 004FC 80AB5C7C 86090298 */ lh $t1, 0x0298($s0) ## 00000298 -/* 00500 80AB5C80 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00504 80AB5C84 5540000F */ bnel $t2, $zero, .L80AB5CC4 -/* 00508 80AB5C88 860D0256 */ lh $t5, 0x0256($s0) ## 00000256 -/* 0050C 80AB5C8C 14C0000C */ bne $a2, $zero, .L80AB5CC0 -/* 00510 80AB5C90 E60E026C */ swc1 $f14, 0x026C($s0) ## 0000026C -/* 00514 80AB5C94 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00518 80AB5C98 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 0051C 80AB5C9C A7A60032 */ sh $a2, 0x0032($sp) -/* 00520 80AB5CA0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00524 80AB5CA4 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 00528 80AB5CA8 4600020D */ trunc.w.s $f8, $f0 -/* 0052C 80AB5CAC 87A60032 */ lh $a2, 0x0032($sp) -/* 00530 80AB5CB0 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 00534 80AB5CB4 440C4000 */ mfc1 $t4, $f8 -/* 00538 80AB5CB8 00000000 */ nop -/* 0053C 80AB5CBC A60C0254 */ sh $t4, 0x0254($s0) ## 00000254 -.L80AB5CC0: -/* 00540 80AB5CC0 860D0256 */ lh $t5, 0x0256($s0) ## 00000256 -.L80AB5CC4: -/* 00544 80AB5CC4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00548 80AB5CC8 55A00053 */ bnel $t5, $zero, .L80AB5E18 -/* 0054C 80AB5CCC C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -/* 00550 80AB5CD0 860E029C */ lh $t6, 0x029C($s0) ## 0000029C -/* 00554 80AB5CD4 2CC10006 */ sltiu $at, $a2, 0x0006 -/* 00558 80AB5CD8 00064080 */ sll $t0, $a2, 2 -/* 0055C 80AB5CDC 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00560 80AB5CE0 A60F029C */ sh $t7, 0x029C($s0) ## 0000029C -/* 00564 80AB5CE4 8618029C */ lh $t8, 0x029C($s0) ## 0000029C -/* 00568 80AB5CE8 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 0056C 80AB5CEC 10200049 */ beq $at, $zero, .L80AB5E14 -/* 00570 80AB5CF0 A619029C */ sh $t9, 0x029C($s0) ## 0000029C -/* 00574 80AB5CF4 3C0180AC */ lui $at, %hi(jtbl_80AB8A94) ## $at = 80AC0000 -/* 00578 80AB5CF8 00280821 */ addu $at, $at, $t0 -/* 0057C 80AB5CFC 8C288A94 */ lw $t0, %lo(jtbl_80AB8A94)($at) -/* 00580 80AB5D00 01000008 */ jr $t0 -/* 00584 80AB5D04 00000000 */ nop -glabel L80AB5D08 -/* 00588 80AB5D08 E60E0274 */ swc1 $f14, 0x0274($s0) ## 00000274 -/* 0058C 80AB5D0C 10000041 */ beq $zero, $zero, .L80AB5E14 -/* 00590 80AB5D10 E60E0270 */ swc1 $f14, 0x0270($s0) ## 00000270 -glabel L80AB5D14 -/* 00594 80AB5D14 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00598 80AB5D18 A6090256 */ sh $t1, 0x0256($s0) ## 00000256 -/* 0059C 80AB5D1C 3C0180AC */ lui $at, %hi(D_80AB8AAC) ## $at = 80AC0000 -/* 005A0 80AB5D20 C42A8AAC */ lwc1 $f10, %lo(D_80AB8AAC)($at) -/* 005A4 80AB5D24 860A029C */ lh $t2, 0x029C($s0) ## 0000029C -/* 005A8 80AB5D28 46025002 */ mul.s $f0, $f10, $f2 -/* 005AC 80AB5D2C E6000274 */ swc1 $f0, 0x0274($s0) ## 00000274 -/* 005B0 80AB5D30 15400038 */ bne $t2, $zero, .L80AB5E14 -/* 005B4 80AB5D34 E6000270 */ swc1 $f0, 0x0270($s0) ## 00000270 -/* 005B8 80AB5D38 E60E0274 */ swc1 $f14, 0x0274($s0) ## 00000274 -/* 005BC 80AB5D3C 10000035 */ beq $zero, $zero, .L80AB5E14 -/* 005C0 80AB5D40 E60E0270 */ swc1 $f14, 0x0270($s0) ## 00000270 -glabel L80AB5D44 -/* 005C4 80AB5D44 3C0180AC */ lui $at, %hi(D_80AB8AB0) ## $at = 80AC0000 -/* 005C8 80AB5D48 C4208AB0 */ lwc1 $f0, %lo(D_80AB8AB0)($at) -/* 005CC 80AB5D4C 3C0180AC */ lui $at, %hi(D_80AB8AB4) ## $at = 80AC0000 -/* 005D0 80AB5D50 C4228AB4 */ lwc1 $f2, %lo(D_80AB8AB4)($at) -/* 005D4 80AB5D54 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 005D8 80AB5D58 A60B0256 */ sh $t3, 0x0256($s0) ## 00000256 -/* 005DC 80AB5D5C 3C0180AC */ lui $at, %hi(D_80AB8AB8) ## $at = 80AC0000 -/* 005E0 80AB5D60 C4308AB8 */ lwc1 $f16, %lo(D_80AB8AB8)($at) -/* 005E4 80AB5D64 3C0180AC */ lui $at, %hi(D_80AB8ABC) ## $at = 80AC0000 -/* 005E8 80AB5D68 860C029C */ lh $t4, 0x029C($s0) ## 0000029C -/* 005EC 80AB5D6C E6100274 */ swc1 $f16, 0x0274($s0) ## 00000274 -/* 005F0 80AB5D70 C4328ABC */ lwc1 $f18, %lo(D_80AB8ABC)($at) -/* 005F4 80AB5D74 E6000288 */ swc1 $f0, 0x0288($s0) ## 00000288 -/* 005F8 80AB5D78 E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 -/* 005FC 80AB5D7C E602028C */ swc1 $f2, 0x028C($s0) ## 0000028C -/* 00600 80AB5D80 E6020284 */ swc1 $f2, 0x0284($s0) ## 00000284 -/* 00604 80AB5D84 15800023 */ bne $t4, $zero, .L80AB5E14 -/* 00608 80AB5D88 E6120270 */ swc1 $f18, 0x0270($s0) ## 00000270 -/* 0060C 80AB5D8C 3C0145FA */ lui $at, 0x45FA ## $at = 45FA0000 -/* 00610 80AB5D90 44810000 */ mtc1 $at, $f0 ## $f0 = 8000.00 -/* 00614 80AB5D94 00000000 */ nop -/* 00618 80AB5D98 E6000288 */ swc1 $f0, 0x0288($s0) ## 00000288 -/* 0061C 80AB5D9C 1000001D */ beq $zero, $zero, .L80AB5E14 -/* 00620 80AB5DA0 E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 -glabel L80AB5DA4 -/* 00624 80AB5DA4 3C0180AC */ lui $at, %hi(D_80AB8AC0) ## $at = 80AC0000 -/* 00628 80AB5DA8 C4208AC0 */ lwc1 $f0, %lo(D_80AB8AC0)($at) -/* 0062C 80AB5DAC 860E029C */ lh $t6, 0x029C($s0) ## 0000029C -/* 00630 80AB5DB0 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00634 80AB5DB4 A60D0256 */ sh $t5, 0x0256($s0) ## 00000256 -/* 00638 80AB5DB8 E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 -/* 0063C 80AB5DBC 15C00015 */ bne $t6, $zero, .L80AB5E14 -/* 00640 80AB5DC0 E6000288 */ swc1 $f0, 0x0288($s0) ## 00000288 -/* 00644 80AB5DC4 3C0180AC */ lui $at, %hi(D_80AB8AC4) ## $at = 80AC0000 -/* 00648 80AB5DC8 C4208AC4 */ lwc1 $f0, %lo(D_80AB8AC4)($at) -/* 0064C 80AB5DCC E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 -/* 00650 80AB5DD0 10000010 */ beq $zero, $zero, .L80AB5E14 -/* 00654 80AB5DD4 E6000288 */ swc1 $f0, 0x0288($s0) ## 00000288 -glabel L80AB5DD8 -/* 00658 80AB5DD8 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 0065C 80AB5DDC 1000000D */ beq $zero, $zero, .L80AB5E14 -/* 00660 80AB5DE0 A60F0254 */ sh $t7, 0x0254($s0) ## 00000254 -glabel L80AB5DE4 -/* 00664 80AB5DE4 3C0180AC */ lui $at, %hi(D_80AB8AC8) ## $at = 80AC0000 -/* 00668 80AB5DE8 C4208AC8 */ lwc1 $f0, %lo(D_80AB8AC8)($at) -/* 0066C 80AB5DEC 8619029C */ lh $t9, 0x029C($s0) ## 0000029C -/* 00670 80AB5DF0 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00674 80AB5DF4 A6180256 */ sh $t8, 0x0256($s0) ## 00000256 -/* 00678 80AB5DF8 E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 -/* 0067C 80AB5DFC 17200005 */ bne $t9, $zero, .L80AB5E14 -/* 00680 80AB5E00 E6000288 */ swc1 $f0, 0x0288($s0) ## 00000288 -/* 00684 80AB5E04 3C0180AC */ lui $at, %hi(D_80AB8ACC) ## $at = 80AC0000 -/* 00688 80AB5E08 C4208ACC */ lwc1 $f0, %lo(D_80AB8ACC)($at) -/* 0068C 80AB5E0C E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 -/* 00690 80AB5E10 E6000288 */ swc1 $f0, 0x0288($s0) ## 00000288 -.L80AB5E14: -/* 00694 80AB5E14 C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -.L80AB5E18: -/* 00698 80AB5E18 C60402E0 */ lwc1 $f4, 0x02E0($s0) ## 000002E0 -/* 0069C 80AB5E1C 260402E0 */ addiu $a0, $s0, 0x02E0 ## $a0 = 000002E0 -/* 006A0 80AB5E20 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 006A4 80AB5E24 46002032 */ c.eq.s $f4, $f0 -/* 006A8 80AB5E28 00000000 */ nop -/* 006AC 80AB5E2C 45030005 */ bc1tl .L80AB5E44 -/* 006B0 80AB5E30 C600026C */ lwc1 $f0, 0x026C($s0) ## 0000026C -/* 006B4 80AB5E34 44050000 */ mfc1 $a1, $f0 -/* 006B8 80AB5E38 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 006BC 80AB5E3C 3C07457A */ lui $a3, 0x457A ## $a3 = 457A0000 -/* 006C0 80AB5E40 C600026C */ lwc1 $f0, 0x026C($s0) ## 0000026C -.L80AB5E44: -/* 006C4 80AB5E44 C60602DC */ lwc1 $f6, 0x02DC($s0) ## 000002DC -/* 006C8 80AB5E48 260402DC */ addiu $a0, $s0, 0x02DC ## $a0 = 000002DC -/* 006CC 80AB5E4C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 006D0 80AB5E50 46003032 */ c.eq.s $f6, $f0 -/* 006D4 80AB5E54 00000000 */ nop -/* 006D8 80AB5E58 45030005 */ bc1tl .L80AB5E70 -/* 006DC 80AB5E5C C6000274 */ lwc1 $f0, 0x0274($s0) ## 00000274 -/* 006E0 80AB5E60 44050000 */ mfc1 $a1, $f0 -/* 006E4 80AB5E64 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 006E8 80AB5E68 3C07457A */ lui $a3, 0x457A ## $a3 = 457A0000 -/* 006EC 80AB5E6C C6000274 */ lwc1 $f0, 0x0274($s0) ## 00000274 -.L80AB5E70: -/* 006F0 80AB5E70 C60802C4 */ lwc1 $f8, 0x02C4($s0) ## 000002C4 -/* 006F4 80AB5E74 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 006F8 80AB5E78 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 006FC 80AB5E7C 46004032 */ c.eq.s $f8, $f0 -/* 00700 80AB5E80 260402C4 */ addiu $a0, $s0, 0x02C4 ## $a0 = 000002C4 -/* 00704 80AB5E84 3C0745DA */ lui $a3, 0x45DA ## $a3 = 45DA0000 -/* 00708 80AB5E88 45030005 */ bc1tl .L80AB5EA0 -/* 0070C 80AB5E8C C6000288 */ lwc1 $f0, 0x0288($s0) ## 00000288 -/* 00710 80AB5E90 44050000 */ mfc1 $a1, $f0 -/* 00714 80AB5E94 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00718 80AB5E98 34E7C000 */ ori $a3, $a3, 0xC000 ## $a3 = 45DAC000 -/* 0071C 80AB5E9C C6000288 */ lwc1 $f0, 0x0288($s0) ## 00000288 -.L80AB5EA0: -/* 00720 80AB5EA0 C60A02C8 */ lwc1 $f10, 0x02C8($s0) ## 000002C8 -/* 00724 80AB5EA4 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 00728 80AB5EA8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 0072C 80AB5EAC 46005032 */ c.eq.s $f10, $f0 -/* 00730 80AB5EB0 260402C8 */ addiu $a0, $s0, 0x02C8 ## $a0 = 000002C8 -/* 00734 80AB5EB4 3C0745DA */ lui $a3, 0x45DA ## $a3 = 45DA0000 -/* 00738 80AB5EB8 45030005 */ bc1tl .L80AB5ED0 -/* 0073C 80AB5EBC C600028C */ lwc1 $f0, 0x028C($s0) ## 0000028C -/* 00740 80AB5EC0 44050000 */ mfc1 $a1, $f0 -/* 00744 80AB5EC4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00748 80AB5EC8 34E7C000 */ ori $a3, $a3, 0xC000 ## $a3 = 45DAC000 -/* 0074C 80AB5ECC C600028C */ lwc1 $f0, 0x028C($s0) ## 0000028C -.L80AB5ED0: -/* 00750 80AB5ED0 C61002CC */ lwc1 $f16, 0x02CC($s0) ## 000002CC -/* 00754 80AB5ED4 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 00758 80AB5ED8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 0075C 80AB5EDC 46008032 */ c.eq.s $f16, $f0 -/* 00760 80AB5EE0 260402CC */ addiu $a0, $s0, 0x02CC ## $a0 = 000002CC -/* 00764 80AB5EE4 3C0745DA */ lui $a3, 0x45DA ## $a3 = 45DA0000 -/* 00768 80AB5EE8 45030005 */ bc1tl .L80AB5F00 -/* 0076C 80AB5EEC C6000270 */ lwc1 $f0, 0x0270($s0) ## 00000270 -/* 00770 80AB5EF0 44050000 */ mfc1 $a1, $f0 -/* 00774 80AB5EF4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00778 80AB5EF8 34E7C000 */ ori $a3, $a3, 0xC000 ## $a3 = 45DAC000 -/* 0077C 80AB5EFC C6000270 */ lwc1 $f0, 0x0270($s0) ## 00000270 -.L80AB5F00: -/* 00780 80AB5F00 C61202D0 */ lwc1 $f18, 0x02D0($s0) ## 000002D0 -/* 00784 80AB5F04 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 00788 80AB5F08 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 0078C 80AB5F0C 46009032 */ c.eq.s $f18, $f0 -/* 00790 80AB5F10 260402D0 */ addiu $a0, $s0, 0x02D0 ## $a0 = 000002D0 -/* 00794 80AB5F14 3C0745DA */ lui $a3, 0x45DA ## $a3 = 45DA0000 -/* 00798 80AB5F18 45030005 */ bc1tl .L80AB5F30 -/* 0079C 80AB5F1C C6000280 */ lwc1 $f0, 0x0280($s0) ## 00000280 -/* 007A0 80AB5F20 44050000 */ mfc1 $a1, $f0 -/* 007A4 80AB5F24 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 007A8 80AB5F28 34E7C000 */ ori $a3, $a3, 0xC000 ## $a3 = 45DAC000 -/* 007AC 80AB5F2C C6000280 */ lwc1 $f0, 0x0280($s0) ## 00000280 -.L80AB5F30: -/* 007B0 80AB5F30 C60402D4 */ lwc1 $f4, 0x02D4($s0) ## 000002D4 -/* 007B4 80AB5F34 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 007B8 80AB5F38 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 007BC 80AB5F3C 46002032 */ c.eq.s $f4, $f0 -/* 007C0 80AB5F40 260402D4 */ addiu $a0, $s0, 0x02D4 ## $a0 = 000002D4 -/* 007C4 80AB5F44 3C0745DA */ lui $a3, 0x45DA ## $a3 = 45DA0000 -/* 007C8 80AB5F48 45030005 */ bc1tl .L80AB5F60 -/* 007CC 80AB5F4C C6000284 */ lwc1 $f0, 0x0284($s0) ## 00000284 -/* 007D0 80AB5F50 44050000 */ mfc1 $a1, $f0 -/* 007D4 80AB5F54 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 007D8 80AB5F58 34E7C000 */ ori $a3, $a3, 0xC000 ## $a3 = 45DAC000 -/* 007DC 80AB5F5C C6000284 */ lwc1 $f0, 0x0284($s0) ## 00000284 -.L80AB5F60: -/* 007E0 80AB5F60 C60602D8 */ lwc1 $f6, 0x02D8($s0) ## 000002D8 -/* 007E4 80AB5F64 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 007E8 80AB5F68 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 007EC 80AB5F6C 46003032 */ c.eq.s $f6, $f0 -/* 007F0 80AB5F70 260402D8 */ addiu $a0, $s0, 0x02D8 ## $a0 = 000002D8 -/* 007F4 80AB5F74 3C0745DA */ lui $a3, 0x45DA ## $a3 = 45DA0000 -/* 007F8 80AB5F78 45030005 */ bc1tl .L80AB5F90 -/* 007FC 80AB5F7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00800 80AB5F80 44050000 */ mfc1 $a1, $f0 -/* 00804 80AB5F84 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00808 80AB5F88 34E7C000 */ ori $a3, $a3, 0xC000 ## $a3 = 45DAC000 -/* 0080C 80AB5F8C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AB5F90: -/* 00810 80AB5F90 8FB00018 */ lw $s0, 0x0018($sp) -/* 00814 80AB5F94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00818 80AB5F98 03E00008 */ jr $ra -/* 0081C 80AB5F9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s deleted file mode 100644 index 82b26aaf16..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s +++ /dev/null @@ -1,112 +0,0 @@ -.rdata -glabel D_80AB87D8 - .asciz "\n\n" - .balign 4 - -glabel D_80AB87DC - .asciz "\x1b[32m ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.late_rodata -glabel D_80AB8AD0 - .float 0.3 - -.text -glabel func_80AB5FA0 -/* 00820 80AB5FA0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00824 80AB5FA4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00828 80AB5FA8 AFB10038 */ sw $s1, 0x0038($sp) -/* 0082C 80AB5FAC AFB00034 */ sw $s0, 0x0034($sp) -/* 00830 80AB5FB0 848E025C */ lh $t6, 0x025C($a0) ## 0000025C -/* 00834 80AB5FB4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00838 80AB5FB8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0083C 80AB5FBC 55C0004C */ bnel $t6, $zero, .L80AB60F0 -/* 00840 80AB5FC0 8FBF003C */ lw $ra, 0x003C($sp) -/* 00844 80AB5FC4 848F0296 */ lh $t7, 0x0296($a0) ## 00000296 -/* 00848 80AB5FC8 29E10007 */ slti $at, $t7, 0x0007 -/* 0084C 80AB5FCC 50200048 */ beql $at, $zero, .L80AB60F0 -/* 00850 80AB5FD0 8FBF003C */ lw $ra, 0x003C($sp) -/* 00854 80AB5FD4 C4A400EC */ lwc1 $f4, 0x00EC($a1) ## 000000EC -/* 00858 80AB5FD8 C4A600E0 */ lwc1 $f6, 0x00E0($a1) ## 000000E0 -/* 0085C 80AB5FDC 46062201 */ sub.s $f8, $f4, $f6 -/* 00860 80AB5FE0 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 00864 80AB5FE4 C4B000E4 */ lwc1 $f16, 0x00E4($a1) ## 000000E4 -/* 00868 80AB5FE8 C4AA00F0 */ lwc1 $f10, 0x00F0($a1) ## 000000F0 -/* 0086C 80AB5FEC 46105481 */ sub.s $f18, $f10, $f16 -/* 00870 80AB5FF0 E7B20050 */ swc1 $f18, 0x0050($sp) -/* 00874 80AB5FF4 C4A600E8 */ lwc1 $f6, 0x00E8($a1) ## 000000E8 -/* 00878 80AB5FF8 C4A400F4 */ lwc1 $f4, 0x00F4($a1) ## 000000F4 -/* 0087C 80AB5FFC 46062201 */ sub.s $f8, $f4, $f6 -/* 00880 80AB6000 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00884 80AB6004 E7A8004C */ swc1 $f8, 0x004C($sp) -/* 00888 80AB6008 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0088C 80AB600C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 00890 80AB6010 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 00894 80AB6014 C60600E0 */ lwc1 $f6, 0x00E0($s0) ## 000000E0 -/* 00898 80AB6018 460A0401 */ sub.s $f16, $f0, $f10 -/* 0089C 80AB601C 3C0180AC */ lui $at, %hi(D_80AB8AD0) ## $at = 80AC0000 -/* 008A0 80AB6020 C42C8AD0 */ lwc1 $f12, %lo(D_80AB8AD0)($at) -/* 008A4 80AB6024 46128102 */ mul.s $f4, $f16, $f18 -/* 008A8 80AB6028 46062200 */ add.s $f8, $f4, $f6 -/* 008AC 80AB602C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 008B0 80AB6030 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 008B4 80AB6034 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 008B8 80AB6038 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 008BC 80AB603C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 008C0 80AB6040 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 008C4 80AB6044 C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 008C8 80AB6048 C60A00E4 */ lwc1 $f10, 0x00E4($s0) ## 000000E4 -/* 008CC 80AB604C 46062202 */ mul.s $f8, $f4, $f6 -/* 008D0 80AB6050 46105480 */ add.s $f18, $f10, $f16 -/* 008D4 80AB6054 46089280 */ add.s $f10, $f18, $f8 -/* 008D8 80AB6058 460A0400 */ add.s $f16, $f0, $f10 -/* 008DC 80AB605C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 008E0 80AB6060 E7B00044 */ swc1 $f16, 0x0044($sp) -/* 008E4 80AB6064 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 008E8 80AB6068 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 008EC 80AB606C C7B2004C */ lwc1 $f18, 0x004C($sp) -/* 008F0 80AB6070 C60A00E8 */ lwc1 $f10, 0x00E8($s0) ## 000000E8 -/* 008F4 80AB6074 46040181 */ sub.s $f6, $f0, $f4 -/* 008F8 80AB6078 C7A40044 */ lwc1 $f4, 0x0044($sp) -/* 008FC 80AB607C C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 00900 80AB6080 AFA00028 */ sw $zero, 0x0028($sp) -/* 00904 80AB6084 46123202 */ mul.s $f8, $f6, $f18 -/* 00908 80AB6088 AFA00024 */ sw $zero, 0x0024($sp) -/* 0090C 80AB608C AFA00020 */ sw $zero, 0x0020($sp) -/* 00910 80AB6090 AFA0001C */ sw $zero, 0x001C($sp) -/* 00914 80AB6094 26041C24 */ addiu $a0, $s0, 0x1C24 ## $a0 = 00001C24 -/* 00918 80AB6098 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0091C 80AB609C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00920 80AB60A0 460A4080 */ add.s $f2, $f8, $f10 -/* 00924 80AB60A4 24070144 */ addiu $a3, $zero, 0x0144 ## $a3 = 00000144 -/* 00928 80AB60A8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 0092C 80AB60AC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00930 80AB60B0 0C00C916 */ jal Actor_SpawnAsChild - -/* 00934 80AB60B4 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 00938 80AB60B8 10400007 */ beq $v0, $zero, .L80AB60D8 -/* 0093C 80AB60BC 3C0480AC */ lui $a0, %hi(D_80AB87D8) ## $a0 = 80AC0000 -/* 00940 80AB60C0 86380296 */ lh $t8, 0x0296($s1) ## 00000296 -/* 00944 80AB60C4 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 00948 80AB60C8 A628025C */ sh $t0, 0x025C($s1) ## 0000025C -/* 0094C 80AB60CC 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00950 80AB60D0 10000006 */ beq $zero, $zero, .L80AB60EC -/* 00954 80AB60D4 A6390296 */ sh $t9, 0x0296($s1) ## 00000296 -.L80AB60D8: -/* 00958 80AB60D8 0C00084C */ jal osSyncPrintf - -/* 0095C 80AB60DC 248487D8 */ addiu $a0, $a0, %lo(D_80AB87D8) ## $a0 = 80AB87D8 -/* 00960 80AB60E0 3C0480AC */ lui $a0, %hi(D_80AB87DC) ## $a0 = 80AC0000 -/* 00964 80AB60E4 0C00084C */ jal osSyncPrintf - -/* 00968 80AB60E8 248487DC */ addiu $a0, $a0, %lo(D_80AB87DC) ## $a0 = 80AB87DC -.L80AB60EC: -/* 0096C 80AB60EC 8FBF003C */ lw $ra, 0x003C($sp) -.L80AB60F0: -/* 00970 80AB60F0 8FB00034 */ lw $s0, 0x0034($sp) -/* 00974 80AB60F4 8FB10038 */ lw $s1, 0x0038($sp) -/* 00978 80AB60F8 03E00008 */ jr $ra -/* 0097C 80AB60FC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s deleted file mode 100644 index 1b90afd0e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_80AB6100 -/* 00980 80AB6100 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00984 80AB6104 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00988 80AB6108 AFB00020 */ sw $s0, 0x0020($sp) -/* 0098C 80AB610C AFA5002C */ sw $a1, 0x002C($sp) -/* 00990 80AB6110 848E025A */ lh $t6, 0x025A($a0) ## 0000025A -/* 00994 80AB6114 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00998 80AB6118 55C0000B */ bnel $t6, $zero, .L80AB6148 -/* 0099C 80AB611C 86080258 */ lh $t0, 0x0258($s0) ## 00000258 -/* 009A0 80AB6120 94980088 */ lhu $t8, 0x0088($a0) ## 00000088 -/* 009A4 80AB6124 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 009A8 80AB6128 A48F025A */ sh $t7, 0x025A($a0) ## 0000025A -/* 009AC 80AB612C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 009B0 80AB6130 13200004 */ beq $t9, $zero, .L80AB6144 -/* 009B4 80AB6134 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 009B8 80AB6138 44812000 */ mtc1 $at, $f4 ## $f4 = 3.50 -/* 009BC 80AB613C 00000000 */ nop -/* 009C0 80AB6140 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -.L80AB6144: -/* 009C4 80AB6144 86080258 */ lh $t0, 0x0258($s0) ## 00000258 -.L80AB6148: -/* 009C8 80AB6148 00067880 */ sll $t7, $a2, 2 -/* 009CC 80AB614C 3C1880AC */ lui $t8, %hi(D_80AB860C) ## $t8 = 80AC0000 -/* 009D0 80AB6150 15000009 */ bne $t0, $zero, .L80AB6178 -/* 009D4 80AB6154 0006C880 */ sll $t9, $a2, 2 -/* 009D8 80AB6158 860902A0 */ lh $t1, 0x02A0($s0) ## 000002A0 -/* 009DC 80AB615C 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 009E0 80AB6160 A60D0258 */ sh $t5, 0x0258($s0) ## 00000258 -/* 009E4 80AB6164 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 009E8 80AB6168 A60A02A0 */ sh $t2, 0x02A0($s0) ## 000002A0 -/* 009EC 80AB616C 860B02A0 */ lh $t3, 0x02A0($s0) ## 000002A0 -/* 009F0 80AB6170 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 009F4 80AB6174 A60C02A0 */ sh $t4, 0x02A0($s0) ## 000002A0 -.L80AB6178: -/* 009F8 80AB6178 860E02A0 */ lh $t6, 0x02A0($s0) ## 000002A0 -/* 009FC 80AB617C 3C0980AC */ lui $t1, %hi(D_80AB8610) ## $t1 = 80AC0000 -/* 00A00 80AB6180 3C0880AC */ lui $t0, %hi(D_80AB860C) ## $t0 = 80AC0000 -/* 00A04 80AB6184 15C00005 */ bne $t6, $zero, .L80AB619C -/* 00A08 80AB6188 25298610 */ addiu $t1, $t1, %lo(D_80AB8610) ## $t1 = 80AB8610 -/* 00A0C 80AB618C 2718860C */ addiu $t8, $t8, %lo(D_80AB860C) ## $t8 = 80AB860C -/* 00A10 80AB6190 01F81021 */ addu $v0, $t7, $t8 -/* 00A14 80AB6194 10000005 */ beq $zero, $zero, .L80AB61AC -/* 00A18 80AB6198 C4420000 */ lwc1 $f2, 0x0000($v0) ## 00000000 -.L80AB619C: -/* 00A1C 80AB619C 2508860C */ addiu $t0, $t0, %lo(D_80AB860C) ## $t0 = 80AB860C -/* 00A20 80AB61A0 03281021 */ addu $v0, $t9, $t0 -/* 00A24 80AB61A4 C4420000 */ lwc1 $f2, 0x0000($v0) ## 00000000 -/* 00A28 80AB61A8 46001087 */ neg.s $f2, $f2 -.L80AB61AC: -/* 00A2C 80AB61AC 54490012 */ bnel $v0, $t1, .L80AB61F8 -/* 00A30 80AB61B0 861902E4 */ lh $t9, 0x02E4($s0) ## 000002E4 -/* 00A34 80AB61B4 860A025E */ lh $t2, 0x025E($s0) ## 0000025E -/* 00A38 80AB61B8 51400006 */ beql $t2, $zero, .L80AB61D4 -/* 00A3C 80AB61BC 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 -/* 00A40 80AB61C0 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 00A44 80AB61C4 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 00A48 80AB61C8 5180000B */ beql $t4, $zero, .L80AB61F8 -/* 00A4C 80AB61CC 861902E4 */ lh $t9, 0x02E4($s0) ## 000002E4 -/* 00A50 80AB61D0 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 -.L80AB61D4: -/* 00A54 80AB61D4 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 -/* 00A58 80AB61D8 A60D025E */ sh $t5, 0x025E($s0) ## 0000025E -/* 00A5C 80AB61DC 55C00006 */ bnel $t6, $zero, .L80AB61F8 -/* 00A60 80AB61E0 861902E4 */ lh $t9, 0x02E4($s0) ## 000002E4 -/* 00A64 80AB61E4 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 00A68 80AB61E8 240F0046 */ addiu $t7, $zero, 0x0046 ## $t7 = 00000046 -/* 00A6C 80AB61EC A60F0268 */ sh $t7, 0x0268($s0) ## 00000268 -/* 00A70 80AB61F0 A61802E4 */ sh $t8, 0x02E4($s0) ## 000002E4 -/* 00A74 80AB61F4 861902E4 */ lh $t9, 0x02E4($s0) ## 000002E4 -.L80AB61F8: -/* 00A78 80AB61F8 C61002FC */ lwc1 $f16, 0x02FC($s0) ## 000002FC -/* 00A7C 80AB61FC AFA00010 */ sw $zero, 0x0010($sp) -/* 00A80 80AB6200 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 00A84 80AB6204 4600848D */ trunc.w.s $f18, $f16 -/* 00A88 80AB6208 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00A8C 80AB620C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00A90 80AB6210 46803220 */ cvt.s.w $f8, $f6 -/* 00A94 80AB6214 44079000 */ mfc1 $a3, $f18 -/* 00A98 80AB6218 00000000 */ nop -/* 00A9C 80AB621C 00073C00 */ sll $a3, $a3, 16 -/* 00AA0 80AB6220 00073C03 */ sra $a3, $a3, 16 -/* 00AA4 80AB6224 46024000 */ add.s $f0, $f8, $f2 -/* 00AA8 80AB6228 4600028D */ trunc.w.s $f10, $f0 -/* 00AAC 80AB622C 44055000 */ mfc1 $a1, $f10 -/* 00AB0 80AB6230 00000000 */ nop -/* 00AB4 80AB6234 00052C00 */ sll $a1, $a1, 16 -/* 00AB8 80AB6238 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00ABC 80AB623C 00052C03 */ sra $a1, $a1, 16 -/* 00AC0 80AB6240 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 00AC4 80AB6244 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 453B8000 -/* 00AC8 80AB6248 260402FC */ addiu $a0, $s0, 0x02FC ## $a0 = 000002FC -/* 00ACC 80AB624C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AD0 80AB6250 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00AD4 80AB6254 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 -/* 00AD8 80AB6258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ADC 80AB625C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00AE0 80AB6260 0C2AD6FE */ jal func_80AB5BF8 -/* 00AE4 80AB6264 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00AE8 80AB6268 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AEC 80AB626C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00AF0 80AB6270 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AF4 80AB6274 03E00008 */ jr $ra -/* 00AF8 80AB6278 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s deleted file mode 100644 index 04629dbeed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80AB627C -/* 00AFC 80AB627C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B00 80AB6280 AFB00028 */ sw $s0, 0x0028($sp) -/* 00B04 80AB6284 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B08 80AB6288 AFBF002C */ sw $ra, 0x002C($sp) -/* 00B0C 80AB628C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00B10 80AB6290 AFA50034 */ sw $a1, 0x0034($sp) -/* 00B14 80AB6294 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00B18 80AB6298 248400E8 */ addiu $a0, $a0, 0x00E8 ## $a0 = 060000E8 -/* 00B1C 80AB629C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00B20 80AB62A0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00B24 80AB62A4 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00B28 80AB62A8 468021A0 */ cvt.s.w $f6, $f4 -/* 00B2C 80AB62AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B30 80AB62B0 24A500E8 */ addiu $a1, $a1, 0x00E8 ## $a1 = 060000E8 -/* 00B34 80AB62B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00B38 80AB62B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B3C 80AB62BC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B40 80AB62C0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00B44 80AB62C4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00B48 80AB62C8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00B4C 80AB62CC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00B50 80AB62D0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00B54 80AB62D4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00B58 80AB62D8 3C0F80AB */ lui $t7, %hi(func_80AB6450) ## $t7 = 80AB0000 -/* 00B5C 80AB62DC 10410008 */ beq $v0, $at, .L80AB6300 -/* 00B60 80AB62E0 25EF6450 */ addiu $t7, $t7, %lo(func_80AB6450) ## $t7 = 80AB6450 -/* 00B64 80AB62E4 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00B68 80AB62E8 10410007 */ beq $v0, $at, .L80AB6308 -/* 00B6C 80AB62EC 3C1880AB */ lui $t8, %hi(func_80AB6324) ## $t8 = 80AB0000 -/* 00B70 80AB62F0 3C0E80AB */ lui $t6, %hi(func_80AB6570) ## $t6 = 80AB0000 -/* 00B74 80AB62F4 25CE6570 */ addiu $t6, $t6, %lo(func_80AB6570) ## $t6 = 80AB6570 -/* 00B78 80AB62F8 10000005 */ beq $zero, $zero, .L80AB6310 -/* 00B7C 80AB62FC AE0E0250 */ sw $t6, 0x0250($s0) ## 00000250 -.L80AB6300: -/* 00B80 80AB6300 10000003 */ beq $zero, $zero, .L80AB6310 -/* 00B84 80AB6304 AE0F0250 */ sw $t7, 0x0250($s0) ## 00000250 -.L80AB6308: -/* 00B88 80AB6308 27186324 */ addiu $t8, $t8, %lo(func_80AB6324) ## $t8 = 80AB6324 -/* 00B8C 80AB630C AE180250 */ sw $t8, 0x0250($s0) ## 00000250 -.L80AB6310: -/* 00B90 80AB6310 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B94 80AB6314 8FB00028 */ lw $s0, 0x0028($sp) -/* 00B98 80AB6318 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B9C 80AB631C 03E00008 */ jr $ra -/* 00BA0 80AB6320 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s deleted file mode 100644 index cb58b06261..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80AB6324 -/* 00BA4 80AB6324 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BA8 80AB6328 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BAC 80AB632C AFA5001C */ sw $a1, 0x001C($sp) -/* 00BB0 80AB6330 908E0308 */ lbu $t6, 0x0308($a0) ## 00000308 -/* 00BB4 80AB6334 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00BB8 80AB6338 51C00015 */ beql $t6, $zero, .L80AB6390 -/* 00BBC 80AB633C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BC0 80AB6340 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 00BC4 80AB6344 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00BC8 80AB6348 AFA40018 */ sw $a0, 0x0018($sp) -/* 00BCC 80AB634C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00BD0 80AB6350 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 00BD4 80AB6354 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BD8 80AB6358 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00BDC 80AB635C 46040180 */ add.s $f6, $f0, $f4 -/* 00BE0 80AB6360 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 00BE4 80AB6364 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00BE8 80AB6368 E4860060 */ swc1 $f6, 0x0060($a0) ## 00000060 -/* 00BEC 80AB636C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00BF0 80AB6370 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 00BF4 80AB6374 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BF8 80AB6378 3C0F80AB */ lui $t7, %hi(func_80AB63A8) ## $t7 = 80AB0000 -/* 00BFC 80AB637C 46080280 */ add.s $f10, $f0, $f8 -/* 00C00 80AB6380 25EF63A8 */ addiu $t7, $t7, %lo(func_80AB63A8) ## $t7 = 80AB63A8 -/* 00C04 80AB6384 AC8F0250 */ sw $t7, 0x0250($a0) ## 00000250 -/* 00C08 80AB6388 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 00C0C 80AB638C 8FA5001C */ lw $a1, 0x001C($sp) -.L80AB6390: -/* 00C10 80AB6390 0C2AD6FE */ jal func_80AB5BF8 -/* 00C14 80AB6394 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C18 80AB6398 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C1C 80AB639C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C20 80AB63A0 03E00008 */ jr $ra -/* 00C24 80AB63A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s deleted file mode 100644 index 1de6aa3f70..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80AB63A8 -/* 00C28 80AB63A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C2C 80AB63AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C30 80AB63B0 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 00C34 80AB63B4 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00C38 80AB63B8 11E0001F */ beq $t7, $zero, .L80AB6438 -/* 00C3C 80AB63BC 00000000 */ nop -/* 00C40 80AB63C0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00C44 80AB63C4 C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 00C48 80AB63C8 3C1880AB */ lui $t8, %hi(func_80AB6570) ## $t8 = 80AB0000 -/* 00C4C 80AB63CC 27186570 */ addiu $t8, $t8, %lo(func_80AB6570) ## $t8 = 80AB6570 -/* 00C50 80AB63D0 4602203C */ c.lt.s $f4, $f2 -/* 00C54 80AB63D4 00000000 */ nop -/* 00C58 80AB63D8 45000017 */ bc1f .L80AB6438 -/* 00C5C 80AB63DC 00000000 */ nop -/* 00C60 80AB63E0 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 00C64 80AB63E4 A480029E */ sh $zero, 0x029E($a0) ## 0000029E -/* 00C68 80AB63E8 8482029E */ lh $v0, 0x029E($a0) ## 0000029E -/* 00C6C 80AB63EC E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 -/* 00C70 80AB63F0 E48002AC */ swc1 $f0, 0x02AC($a0) ## 000002AC -/* 00C74 80AB63F4 C4800028 */ lwc1 $f0, 0x0028($a0) ## 00000028 -/* 00C78 80AB63F8 E4820300 */ swc1 $f2, 0x0300($a0) ## 00000300 -/* 00C7C 80AB63FC E48202FC */ swc1 $f2, 0x02FC($a0) ## 000002FC -/* 00C80 80AB6400 E48002BC */ swc1 $f0, 0x02BC($a0) ## 000002BC -/* 00C84 80AB6404 E48002B0 */ swc1 $f0, 0x02B0($a0) ## 000002B0 -/* 00C88 80AB6408 C480002C */ lwc1 $f0, 0x002C($a0) ## 0000002C -/* 00C8C 80AB640C E4820068 */ swc1 $f2, 0x0068($a0) ## 00000068 -/* 00C90 80AB6410 E482028C */ swc1 $f2, 0x028C($a0) ## 0000028C -/* 00C94 80AB6414 E4820284 */ swc1 $f2, 0x0284($a0) ## 00000284 -/* 00C98 80AB6418 E4820280 */ swc1 $f2, 0x0280($a0) ## 00000280 -/* 00C9C 80AB641C E4820288 */ swc1 $f2, 0x0288($a0) ## 00000288 -/* 00CA0 80AB6420 AC980250 */ sw $t8, 0x0250($a0) ## 00000250 -/* 00CA4 80AB6424 A482025A */ sh $v0, 0x025A($a0) ## 0000025A -/* 00CA8 80AB6428 A482025C */ sh $v0, 0x025C($a0) ## 0000025C -/* 00CAC 80AB642C E48002C0 */ swc1 $f0, 0x02C0($a0) ## 000002C0 -/* 00CB0 80AB6430 10000003 */ beq $zero, $zero, .L80AB6440 -/* 00CB4 80AB6434 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 -.L80AB6438: -/* 00CB8 80AB6438 0C2AD6FE */ jal func_80AB5BF8 -/* 00CBC 80AB643C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -.L80AB6440: -/* 00CC0 80AB6440 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CC4 80AB6444 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CC8 80AB6448 03E00008 */ jr $ra -/* 00CCC 80AB644C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s deleted file mode 100644 index fc84450505..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80AB6450 -/* 00CD0 80AB6450 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CD4 80AB6454 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00CD8 80AB6458 AFB00020 */ sw $s0, 0x0020($sp) -/* 00CDC 80AB645C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00CE0 80AB6460 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00CE4 80AB6464 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00CE8 80AB6468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CEC 80AB646C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00CF0 80AB6470 4606203C */ c.lt.s $f4, $f6 -/* 00CF4 80AB6474 00000000 */ nop -/* 00CF8 80AB6478 45020015 */ bc1fl .L80AB64D0 -/* 00CFC 80AB647C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D00 80AB6480 C4880028 */ lwc1 $f8, 0x0028($a0) ## 00000028 -/* 00D04 80AB6484 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 00D08 80AB6488 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00D0C 80AB648C 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 00D10 80AB6490 460A4001 */ sub.s $f0, $f8, $f10 -/* 00D14 80AB6494 3C0F80AB */ lui $t7, %hi(func_80AB7290) ## $t7 = 80AB0000 -/* 00D18 80AB6498 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00D1C 80AB649C 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 00D20 80AB64A0 46000005 */ abs.s $f0, $f0 -/* 00D24 80AB64A4 25EF7290 */ addiu $t7, $t7, %lo(func_80AB7290) ## $t7 = 80AB7290 -/* 00D28 80AB64A8 4610003C */ c.lt.s $f0, $f16 -/* 00D2C 80AB64AC 00000000 */ nop -/* 00D30 80AB64B0 45020007 */ bc1fl .L80AB64D0 -/* 00D34 80AB64B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D38 80AB64B8 44819000 */ mtc1 $at, $f18 ## $f18 = -2.00 -/* 00D3C 80AB64BC A48E025E */ sh $t6, 0x025E($a0) ## 0000025E -/* 00D40 80AB64C0 AC8F0250 */ sw $t7, 0x0250($a0) ## 00000250 -/* 00D44 80AB64C4 10000025 */ beq $zero, $zero, .L80AB655C -/* 00D48 80AB64C8 E492006C */ swc1 $f18, 0x006C($a0) ## 0000006C -/* 00D4C 80AB64CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AB64D0: -/* 00D50 80AB64D0 0C00BD04 */ jal Actor_HasParent -/* 00D54 80AB64D4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00D58 80AB64D8 10400015 */ beq $v0, $zero, .L80AB6530 -/* 00D5C 80AB64DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D60 80AB64E0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 00D64 80AB64E4 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 00D68 80AB64E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D6C 80AB64EC 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 -/* 00D70 80AB64F0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00D74 80AB64F4 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00D78 80AB64F8 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 00D7C 80AB64FC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00D80 80AB6500 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00D84 80AB6504 3C0880AB */ lui $t0, %hi(func_80AB6BF8) ## $t0 = 80AB0000 -/* 00D88 80AB6508 2402001E */ addiu $v0, $zero, 0x001E ## $v0 = 0000001E -/* 00D8C 80AB650C 25086BF8 */ addiu $t0, $t0, %lo(func_80AB6BF8) ## $t0 = 80AB6BF8 -/* 00D90 80AB6510 0301C824 */ and $t9, $t8, $at -/* 00D94 80AB6514 A6020260 */ sh $v0, 0x0260($s0) ## 00000260 -/* 00D98 80AB6518 A60002E8 */ sh $zero, 0x02E8($s0) ## 000002E8 -/* 00D9C 80AB651C A602025A */ sh $v0, 0x025A($s0) ## 0000025A -/* 00DA0 80AB6520 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00DA4 80AB6524 AE080250 */ sw $t0, 0x0250($s0) ## 00000250 -/* 00DA8 80AB6528 1000000C */ beq $zero, $zero, .L80AB655C -/* 00DAC 80AB652C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80AB6530: -/* 00DB0 80AB6530 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00DB4 80AB6534 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00DB8 80AB6538 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DBC 80AB653C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00DC0 80AB6540 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 00DC4 80AB6544 0C00BD0D */ jal func_8002F434 -/* 00DC8 80AB6548 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00DCC 80AB654C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DD0 80AB6550 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DD4 80AB6554 0C2AD6FE */ jal func_80AB5BF8 -/* 00DD8 80AB6558 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80AB655C: -/* 00DDC 80AB655C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DE0 80AB6560 8FB00020 */ lw $s0, 0x0020($sp) -/* 00DE4 80AB6564 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DE8 80AB6568 03E00008 */ jr $ra -/* 00DEC 80AB656C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s deleted file mode 100644 index b9659df94e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s +++ /dev/null @@ -1,361 +0,0 @@ -.late_rodata -glabel D_80AB8AD4 - .float 1.99000000954 - -glabel D_80AB8AD8 - .float 3.99 - -glabel D_80AB8ADC - .float 3.99 - -glabel D_80AB8AE0 - .float 10430.378 - -.text -glabel func_80AB6570 -/* 00DF0 80AB6570 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00DF4 80AB6574 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00DF8 80AB6578 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00DFC 80AB657C AFB00020 */ sw $s0, 0x0020($sp) -/* 00E00 80AB6580 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00E04 80AB6584 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E08 80AB6588 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E0C 80AB658C AFA50044 */ sw $a1, 0x0044($sp) -/* 00E10 80AB6590 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00E14 80AB6594 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00E18 80AB6598 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E1C 80AB659C E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00E20 80AB65A0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00E24 80AB65A4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00E28 80AB65A8 C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 00E2C 80AB65AC 11C10022 */ beq $t6, $at, .L80AB6638 -/* 00E30 80AB65B0 46000386 */ mov.s $f14, $f0 -/* 00E34 80AB65B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E38 80AB65B8 8FA50044 */ lw $a1, 0x0044($sp) -/* 00E3C 80AB65BC E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00E40 80AB65C0 0C00BD04 */ jal Actor_HasParent -/* 00E44 80AB65C4 E7AE0030 */ swc1 $f14, 0x0030($sp) -/* 00E48 80AB65C8 C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 00E4C 80AB65CC 10400012 */ beq $v0, $zero, .L80AB6618 -/* 00E50 80AB65D0 C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 00E54 80AB65D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E58 80AB65D8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E5C 80AB65DC 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 -/* 00E60 80AB65E0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 00E64 80AB65E4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00E68 80AB65E8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00E6C 80AB65EC 3C1980AB */ lui $t9, %hi(func_80AB6BF8) ## $t9 = 80AB0000 -/* 00E70 80AB65F0 2402001E */ addiu $v0, $zero, 0x001E ## $v0 = 0000001E -/* 00E74 80AB65F4 27396BF8 */ addiu $t9, $t9, %lo(func_80AB6BF8) ## $t9 = 80AB6BF8 -/* 00E78 80AB65F8 01E1C024 */ and $t8, $t7, $at -/* 00E7C 80AB65FC A6020260 */ sh $v0, 0x0260($s0) ## 00000260 -/* 00E80 80AB6600 A60002E8 */ sh $zero, 0x02E8($s0) ## 000002E8 -/* 00E84 80AB6604 A602025A */ sh $v0, 0x025A($s0) ## 0000025A -/* 00E88 80AB6608 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 00E8C 80AB660C AE190250 */ sw $t9, 0x0250($s0) ## 00000250 -/* 00E90 80AB6610 10000104 */ beq $zero, $zero, .L80AB6A24 -/* 00E94 80AB6614 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80AB6618: -/* 00E98 80AB6618 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E9C 80AB661C 8FA50044 */ lw $a1, 0x0044($sp) -/* 00EA0 80AB6620 E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00EA4 80AB6624 0C00BD60 */ jal func_8002F580 -/* 00EA8 80AB6628 E7AE0030 */ swc1 $f14, 0x0030($sp) -/* 00EAC 80AB662C C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 00EB0 80AB6630 1000001E */ beq $zero, $zero, .L80AB66AC -/* 00EB4 80AB6634 C7AE0030 */ lwc1 $f14, 0x0030($sp) -.L80AB6638: -/* 00EB8 80AB6638 860802E8 */ lh $t0, 0x02E8($s0) ## 000002E8 -/* 00EBC 80AB663C 5100001C */ beql $t0, $zero, .L80AB66B0 -/* 00EC0 80AB6640 A7A0002E */ sh $zero, 0x002E($sp) -/* 00EC4 80AB6644 860A0264 */ lh $t2, 0x0264($s0) ## 00000264 -/* 00EC8 80AB6648 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00ECC 80AB664C A60902A6 */ sh $t1, 0x02A6($s0) ## 000002A6 -/* 00ED0 80AB6650 15400005 */ bne $t2, $zero, .L80AB6668 -/* 00ED4 80AB6654 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ED8 80AB6658 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00EDC 80AB665C 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 -/* 00EE0 80AB6660 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 00EE4 80AB6664 A60B0264 */ sh $t3, 0x0264($s0) ## 00000264 -.L80AB6668: -/* 00EE8 80AB6668 3C0180AC */ lui $at, %hi(D_80AB8AD4) ## $at = 80AC0000 -/* 00EEC 80AB666C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00EF0 80AB6670 C42C8AD4 */ lwc1 $f12, %lo(D_80AB8AD4)($at) -/* 00EF4 80AB6674 4600018D */ trunc.w.s $f6, $f0 -/* 00EF8 80AB6678 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00EFC 80AB667C 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00F00 80AB6680 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00F04 80AB6684 440D3000 */ mfc1 $t5, $f6 -/* 00F08 80AB6688 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00F0C 80AB668C 3C0E80AB */ lui $t6, %hi(func_80AB6A38) ## $t6 = 80AB0000 -/* 00F10 80AB6690 25CE6A38 */ addiu $t6, $t6, %lo(func_80AB6A38) ## $t6 = 80AB6A38 -/* 00F14 80AB6694 AE0E0250 */ sw $t6, 0x0250($s0) ## 00000250 -/* 00F18 80AB6698 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00F1C 80AB669C E60A0300 */ swc1 $f10, 0x0300($s0) ## 00000300 -/* 00F20 80AB66A0 A60D02A0 */ sh $t5, 0x02A0($s0) ## 000002A0 -/* 00F24 80AB66A4 100000DF */ beq $zero, $zero, .L80AB6A24 -/* 00F28 80AB66A8 E61202FC */ swc1 $f18, 0x02FC($s0) ## 000002FC -.L80AB66AC: -/* 00F2C 80AB66AC A7A0002E */ sh $zero, 0x002E($sp) -.L80AB66B0: -/* 00F30 80AB66B0 8602025C */ lh $v0, 0x025C($s0) ## 0000025C -/* 00F34 80AB66B4 3C0180AC */ lui $at, %hi(D_80AB8AD8) ## $at = 80AC0000 -/* 00F38 80AB66B8 1040001F */ beq $v0, $zero, .L80AB6738 -/* 00F3C 80AB66BC 00000000 */ nop -/* 00F40 80AB66C0 C42C8AD8 */ lwc1 $f12, %lo(D_80AB8AD8)($at) -/* 00F44 80AB66C4 E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00F48 80AB66C8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00F4C 80AB66CC E7AE0030 */ swc1 $f14, 0x0030($sp) -/* 00F50 80AB66D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00F54 80AB66D4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00F58 80AB66D8 C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 00F5C 80AB66DC C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 00F60 80AB66E0 4604003C */ c.lt.s $f0, $f4 -/* 00F64 80AB66E4 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 -/* 00F68 80AB66E8 3C0580AC */ lui $a1, %hi(D_80AB8604) ## $a1 = 80AC0000 -/* 00F6C 80AB66EC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00F70 80AB66F0 45000007 */ bc1f .L80AB6710 -/* 00F74 80AB66F4 3C07457A */ lui $a3, 0x457A ## $a3 = 457A0000 -/* 00F78 80AB66F8 860F02E6 */ lh $t7, 0x02E6($s0) ## 000002E6 -/* 00F7C 80AB66FC 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00F80 80AB6700 A61802E6 */ sh $t8, 0x02E6($s0) ## 000002E6 -/* 00F84 80AB6704 861902E6 */ lh $t9, 0x02E6($s0) ## 000002E6 -/* 00F88 80AB6708 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00F8C 80AB670C A60802E6 */ sh $t0, 0x02E6($s0) ## 000002E6 -.L80AB6710: -/* 00F90 80AB6710 860902E6 */ lh $t1, 0x02E6($s0) ## 000002E6 -/* 00F94 80AB6714 E7AE0030 */ swc1 $f14, 0x0030($sp) -/* 00F98 80AB6718 E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00F9C 80AB671C 00095080 */ sll $t2, $t1, 2 -/* 00FA0 80AB6720 00AA2821 */ addu $a1, $a1, $t2 -/* 00FA4 80AB6724 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00FA8 80AB6728 8CA58604 */ lw $a1, %lo(D_80AB8604)($a1) -/* 00FAC 80AB672C C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 00FB0 80AB6730 C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 00FB4 80AB6734 8602025C */ lh $v0, 0x025C($s0) ## 0000025C -.L80AB6738: -/* 00FB8 80AB6738 54400066 */ bnel $v0, $zero, .L80AB68D4 -/* 00FBC 80AB673C 860C025A */ lh $t4, 0x025A($s0) ## 0000025A -/* 00FC0 80AB6740 860B025A */ lh $t3, 0x025A($s0) ## 0000025A -/* 00FC4 80AB6744 55600063 */ bnel $t3, $zero, .L80AB68D4 -/* 00FC8 80AB6748 860C025A */ lh $t4, 0x025A($s0) ## 0000025A -/* 00FCC 80AB674C 860C029E */ lh $t4, 0x029E($s0) ## 0000029E -/* 00FD0 80AB6750 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00FD4 80AB6754 A60D029E */ sh $t5, 0x029E($s0) ## 0000029E -/* 00FD8 80AB6758 860E029E */ lh $t6, 0x029E($s0) ## 0000029E -/* 00FDC 80AB675C 29C10008 */ slti $at, $t6, 0x0008 -/* 00FE0 80AB6760 14200051 */ bne $at, $zero, .L80AB68A8 -/* 00FE4 80AB6764 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00FE8 80AB6768 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 00FEC 80AB676C E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00FF0 80AB6770 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00FF4 80AB6774 E7AE0030 */ swc1 $f14, 0x0030($sp) -/* 00FF8 80AB6778 4600018D */ trunc.w.s $f6, $f0 -/* 00FFC 80AB677C 3C0180AC */ lui $at, %hi(D_80AB8ADC) ## $at = 80AC0000 -/* 01000 80AB6780 44183000 */ mfc1 $t8, $f6 -/* 01004 80AB6784 00000000 */ nop -/* 01008 80AB6788 A618025C */ sh $t8, 0x025C($s0) ## 0000025C -/* 0100C 80AB678C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01010 80AB6790 C42C8ADC */ lwc1 $f12, %lo(D_80AB8ADC)($at) -/* 01014 80AB6794 4600020D */ trunc.w.s $f8, $f0 -/* 01018 80AB6798 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 0101C 80AB679C C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 01020 80AB67A0 C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 01024 80AB67A4 44084000 */ mfc1 $t0, $f8 -/* 01028 80AB67A8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0102C 80AB67AC 1041001A */ beq $v0, $at, .L80AB6818 -/* 01030 80AB67B0 A608029E */ sh $t0, 0x029E($s0) ## 0000029E -/* 01034 80AB67B4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01038 80AB67B8 50410018 */ beql $v0, $at, .L80AB681C -/* 0103C 80AB67BC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01040 80AB67C0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01044 80AB67C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01048 80AB67C8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0104C 80AB67CC 460A103C */ c.lt.s $f2, $f10 -/* 01050 80AB67D0 00000000 */ nop -/* 01054 80AB67D4 45020006 */ bc1fl .L80AB67F0 -/* 01058 80AB67D8 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 0105C 80AB67DC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01060 80AB67E0 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 01064 80AB67E4 10000004 */ beq $zero, $zero, .L80AB67F8 -/* 01068 80AB67E8 46001081 */ sub.s $f2, $f2, $f0 -/* 0106C 80AB67EC 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -.L80AB67F0: -/* 01070 80AB67F0 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 01074 80AB67F4 46121080 */ add.s $f2, $f2, $f18 -.L80AB67F8: -/* 01078 80AB67F8 4604703C */ c.lt.s $f14, $f4 -/* 0107C 80AB67FC 00000000 */ nop -/* 01080 80AB6800 45000003 */ bc1f .L80AB6810 -/* 01084 80AB6804 00000000 */ nop -/* 01088 80AB6808 10000020 */ beq $zero, $zero, .L80AB688C -/* 0108C 80AB680C 46007381 */ sub.s $f14, $f14, $f0 -.L80AB6810: -/* 01090 80AB6810 1000001E */ beq $zero, $zero, .L80AB688C -/* 01094 80AB6814 46007380 */ add.s $f14, $f14, $f0 -.L80AB6818: -/* 01098 80AB6818 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -.L80AB681C: -/* 0109C 80AB681C 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 010A0 80AB6820 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 010A4 80AB6824 00000000 */ nop -/* 010A8 80AB6828 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 010AC 80AB682C 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 010B0 80AB6830 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 010B4 80AB6834 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 010B8 80AB6838 C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 010BC 80AB683C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 010C0 80AB6840 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 010C4 80AB6844 4610103C */ c.lt.s $f2, $f16 -/* 010C8 80AB6848 00000000 */ nop -/* 010CC 80AB684C 45020006 */ bc1fl .L80AB6868 -/* 010D0 80AB6850 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 010D4 80AB6854 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 010D8 80AB6858 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 010DC 80AB685C 10000004 */ beq $zero, $zero, .L80AB6870 -/* 010E0 80AB6860 460C1081 */ sub.s $f2, $f2, $f12 -/* 010E4 80AB6864 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -.L80AB6868: -/* 010E8 80AB6868 00000000 */ nop -/* 010EC 80AB686C 460C1080 */ add.s $f2, $f2, $f12 -.L80AB6870: -/* 010F0 80AB6870 4610003C */ c.lt.s $f0, $f16 -/* 010F4 80AB6874 00000000 */ nop -/* 010F8 80AB6878 45020004 */ bc1fl .L80AB688C -/* 010FC 80AB687C 460C0380 */ add.s $f14, $f0, $f12 -/* 01100 80AB6880 10000002 */ beq $zero, $zero, .L80AB688C -/* 01104 80AB6884 460C0381 */ sub.s $f14, $f0, $f12 -/* 01108 80AB6888 460C0380 */ add.s $f14, $f0, $f12 -.L80AB688C: -/* 0110C 80AB688C C60602AC */ lwc1 $f6, 0x02AC($s0) ## 000002AC -/* 01110 80AB6890 C60A02B4 */ lwc1 $f10, 0x02B4($s0) ## 000002B4 -/* 01114 80AB6894 46023200 */ add.s $f8, $f6, $f2 -/* 01118 80AB6898 460E5480 */ add.s $f18, $f10, $f14 -/* 0111C 80AB689C E60802B8 */ swc1 $f8, 0x02B8($s0) ## 000002B8 -/* 01120 80AB68A0 1000000B */ beq $zero, $zero, .L80AB68D0 -/* 01124 80AB68A4 E61202C0 */ swc1 $f18, 0x02C0($s0) ## 000002C0 -.L80AB68A8: -/* 01128 80AB68A8 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 0112C 80AB68AC 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 01130 80AB68B0 A609025A */ sh $t1, 0x025A($s0) ## 0000025A -/* 01134 80AB68B4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 01138 80AB68B8 11600005 */ beq $t3, $zero, .L80AB68D0 -/* 0113C 80AB68BC 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 01140 80AB68C0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01144 80AB68C4 44813000 */ mtc1 $at, $f6 ## $f6 = 3.50 -/* 01148 80AB68C8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0114C 80AB68CC E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -.L80AB68D0: -/* 01150 80AB68D0 860C025A */ lh $t4, 0x025A($s0) ## 0000025A -.L80AB68D4: -/* 01154 80AB68D4 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 -/* 01158 80AB68D8 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 0115C 80AB68DC 5180004E */ beql $t4, $zero, .L80AB6A18 -/* 01160 80AB68E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01164 80AB68E4 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 01168 80AB68E8 3C06457A */ lui $a2, 0x457A ## $a2 = 457A0000 -/* 0116C 80AB68EC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01170 80AB68F0 A7AD002E */ sh $t5, 0x002E($sp) -/* 01174 80AB68F4 8E0702FC */ lw $a3, 0x02FC($s0) ## 000002FC -/* 01178 80AB68F8 8E0502B8 */ lw $a1, 0x02B8($s0) ## 000002B8 -/* 0117C 80AB68FC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 01180 80AB6900 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01184 80AB6904 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01188 80AB6908 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 0118C 80AB690C 8E0502C0 */ lw $a1, 0x02C0($s0) ## 000002C0 -/* 01190 80AB6910 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01194 80AB6914 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01198 80AB6918 8E0702FC */ lw $a3, 0x02FC($s0) ## 000002FC -/* 0119C 80AB691C 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 -/* 011A0 80AB6920 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 011A4 80AB6924 260402FC */ addiu $a0, $s0, 0x02FC ## $a0 = 000002FC -/* 011A8 80AB6928 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 011AC 80AB692C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 011B0 80AB6930 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011B4 80AB6934 C60802B8 */ lwc1 $f8, 0x02B8($s0) ## 000002B8 -/* 011B8 80AB6938 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 011BC 80AB693C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 011C0 80AB6940 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 011C4 80AB6944 460A4301 */ sub.s $f12, $f8, $f10 -/* 011C8 80AB6948 C61202C0 */ lwc1 $f18, 0x02C0($s0) ## 000002C0 -/* 011CC 80AB694C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 011D0 80AB6950 46006005 */ abs.s $f0, $f12 -/* 011D4 80AB6954 46049381 */ sub.s $f14, $f18, $f4 -/* 011D8 80AB6958 4602003C */ c.lt.s $f0, $f2 -/* 011DC 80AB695C 46007005 */ abs.s $f0, $f14 -/* 011E0 80AB6960 45020004 */ bc1fl .L80AB6974 -/* 011E4 80AB6964 4602003C */ c.lt.s $f0, $f2 -/* 011E8 80AB6968 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 011EC 80AB696C 00000000 */ nop -/* 011F0 80AB6970 4602003C */ c.lt.s $f0, $f2 -.L80AB6974: -/* 011F4 80AB6974 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011F8 80AB6978 45020004 */ bc1fl .L80AB698C -/* 011FC 80AB697C 46006032 */ c.eq.s $f12, $f0 -/* 01200 80AB6980 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01204 80AB6984 00000000 */ nop -/* 01208 80AB6988 46006032 */ c.eq.s $f12, $f0 -.L80AB698C: -/* 0120C 80AB698C 00000000 */ nop -/* 01210 80AB6990 45000007 */ bc1f .L80AB69B0 -/* 01214 80AB6994 00000000 */ nop -/* 01218 80AB6998 46007032 */ c.eq.s $f14, $f0 -/* 0121C 80AB699C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 01220 80AB69A0 45000003 */ bc1f .L80AB69B0 -/* 01224 80AB69A4 00000000 */ nop -/* 01228 80AB69A8 A600025A */ sh $zero, 0x025A($s0) ## 0000025A -/* 0122C 80AB69AC A60E029E */ sh $t6, 0x029E($s0) ## 0000029E -.L80AB69B0: -/* 01230 80AB69B0 0C03F494 */ jal Math_atan2f -/* 01234 80AB69B4 00000000 */ nop -/* 01238 80AB69B8 3C0180AC */ lui $at, %hi(D_80AB8AE0) ## $at = 80AC0000 -/* 0123C 80AB69BC C4268AE0 */ lwc1 $f6, %lo(D_80AB8AE0)($at) -/* 01240 80AB69C0 C6120300 */ lwc1 $f18, 0x0300($s0) ## 00000300 -/* 01244 80AB69C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01248 80AB69C8 46060202 */ mul.s $f8, $f0, $f6 -/* 0124C 80AB69CC 4600910D */ trunc.w.s $f4, $f18 -/* 01250 80AB69D0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01254 80AB69D4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01258 80AB69D8 44072000 */ mfc1 $a3, $f4 -/* 0125C 80AB69DC 4600428D */ trunc.w.s $f10, $f8 -/* 01260 80AB69E0 00073C00 */ sll $a3, $a3, 16 -/* 01264 80AB69E4 00073C03 */ sra $a3, $a3, 16 -/* 01268 80AB69E8 44055000 */ mfc1 $a1, $f10 -/* 0126C 80AB69EC 00000000 */ nop -/* 01270 80AB69F0 00052C00 */ sll $a1, $a1, 16 -/* 01274 80AB69F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01278 80AB69F8 00052C03 */ sra $a1, $a1, 16 -/* 0127C 80AB69FC 3C05461C */ lui $a1, 0x461C ## $a1 = 461C0000 -/* 01280 80AB6A00 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = 461C4000 -/* 01284 80AB6A04 26040300 */ addiu $a0, $s0, 0x0300 ## $a0 = 00000300 -/* 01288 80AB6A08 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0128C 80AB6A0C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01290 80AB6A10 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 01294 80AB6A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AB6A18: -/* 01298 80AB6A18 8FA50044 */ lw $a1, 0x0044($sp) -/* 0129C 80AB6A1C 0C2AD6FE */ jal func_80AB5BF8 -/* 012A0 80AB6A20 87A6002E */ lh $a2, 0x002E($sp) -.L80AB6A24: -/* 012A4 80AB6A24 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012A8 80AB6A28 8FB00020 */ lw $s0, 0x0020($sp) -/* 012AC 80AB6A2C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 012B0 80AB6A30 03E00008 */ jr $ra -/* 012B4 80AB6A34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s deleted file mode 100644 index 93d7451c10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel D_80AB8AE4 - .float 10430.378 - -.text -glabel func_80AB6A38 -/* 012B8 80AB6A38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 012BC 80AB6A3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 012C0 80AB6A40 AFA5002C */ sw $a1, 0x002C($sp) -/* 012C4 80AB6A44 848202E8 */ lh $v0, 0x02E8($a0) ## 000002E8 -/* 012C8 80AB6A48 8FAF002C */ lw $t7, 0x002C($sp) -/* 012CC 80AB6A4C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 012D0 80AB6A50 2446FFFF */ addiu $a2, $v0, 0xFFFF ## $a2 = FFFFFFFF -/* 012D4 80AB6A54 00063400 */ sll $a2, $a2, 16 -/* 012D8 80AB6A58 1440001A */ bne $v0, $zero, .L80AB6AC4 -/* 012DC 80AB6A5C 00063403 */ sra $a2, $a2, 16 -/* 012E0 80AB6A60 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 012E4 80AB6A64 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 012E8 80AB6A68 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 012EC 80AB6A6C C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 012F0 80AB6A70 A480029E */ sh $zero, 0x029E($a0) ## 0000029E -/* 012F4 80AB6A74 8482029E */ lh $v0, 0x029E($a0) ## 0000029E -/* 012F8 80AB6A78 3C0E80AB */ lui $t6, %hi(func_80AB627C) ## $t6 = 80AB0000 -/* 012FC 80AB6A7C 25CE627C */ addiu $t6, $t6, %lo(func_80AB627C) ## $t6 = 80AB627C -/* 01300 80AB6A80 E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 -/* 01304 80AB6A84 E49002AC */ swc1 $f16, 0x02AC($a0) ## 000002AC -/* 01308 80AB6A88 E48E02BC */ swc1 $f14, 0x02BC($a0) ## 000002BC -/* 0130C 80AB6A8C E48E02B0 */ swc1 $f14, 0x02B0($a0) ## 000002B0 -/* 01310 80AB6A90 E48C02C0 */ swc1 $f12, 0x02C0($a0) ## 000002C0 -/* 01314 80AB6A94 E48C02B4 */ swc1 $f12, 0x02B4($a0) ## 000002B4 -/* 01318 80AB6A98 A482025A */ sh $v0, 0x025A($a0) ## 0000025A -/* 0131C 80AB6A9C A482025C */ sh $v0, 0x025C($a0) ## 0000025C -/* 01320 80AB6AA0 E4920300 */ swc1 $f18, 0x0300($a0) ## 00000300 -/* 01324 80AB6AA4 E49202FC */ swc1 $f18, 0x02FC($a0) ## 000002FC -/* 01328 80AB6AA8 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 0132C 80AB6AAC E492028C */ swc1 $f18, 0x028C($a0) ## 0000028C -/* 01330 80AB6AB0 E4920284 */ swc1 $f18, 0x0284($a0) ## 00000284 -/* 01334 80AB6AB4 E4920280 */ swc1 $f18, 0x0280($a0) ## 00000280 -/* 01338 80AB6AB8 E4920288 */ swc1 $f18, 0x0288($a0) ## 00000288 -/* 0133C 80AB6ABC 1000004A */ beq $zero, $zero, .L80AB6BE8 -/* 01340 80AB6AC0 AC8E0250 */ sw $t6, 0x0250($a0) ## 00000250 -.L80AB6AC4: -/* 01344 80AB6AC4 030FC021 */ addu $t8, $t8, $t7 -/* 01348 80AB6AC8 8F181E08 */ lw $t8, 0x1E08($t8) ## 00011E08 -/* 0134C 80AB6ACC 0006C8C0 */ sll $t9, $a2, 3 -/* 01350 80AB6AD0 3C0B8016 */ lui $t3, %hi(gSegments) -/* 01354 80AB6AD4 03192821 */ addu $a1, $t8, $t9 -/* 01358 80AB6AD8 8CA30004 */ lw $v1, 0x0004($a1) ## 00000004 -/* 0135C 80AB6ADC 848D02EA */ lh $t5, 0x02EA($a0) ## 000002EA -/* 01360 80AB6AE0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01364 80AB6AE4 00034100 */ sll $t0, $v1, 4 -/* 01368 80AB6AE8 00084F02 */ srl $t1, $t0, 28 -/* 0136C 80AB6AEC 00095080 */ sll $t2, $t1, 2 -/* 01370 80AB6AF0 016A5821 */ addu $t3, $t3, $t2 -/* 01374 80AB6AF4 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* 01378 80AB6AF8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0137C 80AB6AFC 00616024 */ and $t4, $v1, $at -/* 01380 80AB6B00 000D7080 */ sll $t6, $t5, 2 -/* 01384 80AB6B04 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01388 80AB6B08 01CD7023 */ subu $t6, $t6, $t5 -/* 0138C 80AB6B0C 016C1021 */ addu $v0, $t3, $t4 -/* 01390 80AB6B10 00411021 */ addu $v0, $v0, $at -/* 01394 80AB6B14 000E7040 */ sll $t6, $t6, 1 -/* 01398 80AB6B18 004E1021 */ addu $v0, $v0, $t6 -/* 0139C 80AB6B1C 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 013A0 80AB6B20 84580004 */ lh $t8, 0x0004($v0) ## 00000004 -/* 013A4 80AB6B24 C4880024 */ lwc1 $f8, 0x0024($a0) ## 00000024 -/* 013A8 80AB6B28 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 013AC 80AB6B2C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 013B0 80AB6B30 C492002C */ lwc1 $f18, 0x002C($a0) ## 0000002C -/* 013B4 80AB6B34 468021A0 */ cvt.s.w $f6, $f4 -/* 013B8 80AB6B38 AFA40028 */ sw $a0, 0x0028($sp) -/* 013BC 80AB6B3C 46805420 */ cvt.s.w $f16, $f10 -/* 013C0 80AB6B40 46083301 */ sub.s $f12, $f6, $f8 -/* 013C4 80AB6B44 46128381 */ sub.s $f14, $f16, $f18 -/* 013C8 80AB6B48 E7AC001C */ swc1 $f12, 0x001C($sp) -/* 013CC 80AB6B4C 0C03F494 */ jal Math_atan2f -/* 013D0 80AB6B50 E7AE0018 */ swc1 $f14, 0x0018($sp) -/* 013D4 80AB6B54 3C0180AC */ lui $at, %hi(D_80AB8AE4) ## $at = 80AC0000 -/* 013D8 80AB6B58 C4248AE4 */ lwc1 $f4, %lo(D_80AB8AE4)($at) -/* 013DC 80AB6B5C 8FA40028 */ lw $a0, 0x0028($sp) -/* 013E0 80AB6B60 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 013E4 80AB6B64 46040182 */ mul.s $f6, $f0, $f4 -/* 013E8 80AB6B68 4600320D */ trunc.w.s $f8, $f6 -/* 013EC 80AB6B6C 44084000 */ mfc1 $t0, $f8 -/* 013F0 80AB6B70 00000000 */ nop -/* 013F4 80AB6B74 A48802E4 */ sh $t0, 0x02E4($a0) ## 000002E4 -/* 013F8 80AB6B78 0C2AD840 */ jal func_80AB6100 -/* 013FC 80AB6B7C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01400 80AB6B80 C7A0001C */ lwc1 $f0, 0x001C($sp) -/* 01404 80AB6B84 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01408 80AB6B88 44811000 */ mtc1 $at, $f2 ## $f2 = 30.00 -/* 0140C 80AB6B8C 46000005 */ abs.s $f0, $f0 -/* 01410 80AB6B90 8FA40028 */ lw $a0, 0x0028($sp) -/* 01414 80AB6B94 4602003C */ c.lt.s $f0, $f2 -/* 01418 80AB6B98 C7A00018 */ lwc1 $f0, 0x0018($sp) -/* 0141C 80AB6B9C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01420 80AB6BA0 4500000F */ bc1f .L80AB6BE0 -/* 01424 80AB6BA4 00000000 */ nop -/* 01428 80AB6BA8 46000005 */ abs.s $f0, $f0 -/* 0142C 80AB6BAC 4602003C */ c.lt.s $f0, $f2 -/* 01430 80AB6BB0 00000000 */ nop -/* 01434 80AB6BB4 4500000A */ bc1f .L80AB6BE0 -/* 01438 80AB6BB8 00000000 */ nop -/* 0143C 80AB6BBC 848902EA */ lh $t1, 0x02EA($a0) ## 000002EA -/* 01440 80AB6BC0 848C02EC */ lh $t4, 0x02EC($a0) ## 000002EC -/* 01444 80AB6BC4 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01448 80AB6BC8 A48A02EA */ sh $t2, 0x02EA($a0) ## 000002EA -/* 0144C 80AB6BCC 848B02EA */ lh $t3, 0x02EA($a0) ## 000002EA -/* 01450 80AB6BD0 016C082A */ slt $at, $t3, $t4 -/* 01454 80AB6BD4 14200002 */ bne $at, $zero, .L80AB6BE0 -/* 01458 80AB6BD8 00000000 */ nop -/* 0145C 80AB6BDC A48002EA */ sh $zero, 0x02EA($a0) ## 000002EA -.L80AB6BE0: -/* 01460 80AB6BE0 0C2AD6FE */ jal func_80AB5BF8 -/* 01464 80AB6BE4 8FA5002C */ lw $a1, 0x002C($sp) -.L80AB6BE8: -/* 01468 80AB6BE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0146C 80AB6BEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01470 80AB6BF0 03E00008 */ jr $ra -/* 01474 80AB6BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s deleted file mode 100644 index 2a7e3698ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s +++ /dev/null @@ -1,87 +0,0 @@ -.late_rodata -glabel D_80AB8AE8 - .float 5000.0 - -glabel D_80AB8AEC - .float 5000.0 - -glabel D_80AB8AF0 - .float 5000.0 - -.text -glabel func_80AB6BF8 -/* 01478 80AB6BF8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0147C 80AB6BFC AFBF001C */ sw $ra, 0x001C($sp) -/* 01480 80AB6C00 AFB00018 */ sw $s0, 0x0018($sp) -/* 01484 80AB6C04 AFA50024 */ sw $a1, 0x0024($sp) -/* 01488 80AB6C08 848E025A */ lh $t6, 0x025A($a0) ## 0000025A -/* 0148C 80AB6C0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01490 80AB6C10 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01494 80AB6C14 15C00004 */ bne $t6, $zero, .L80AB6C28 -/* 01498 80AB6C18 3C0180AC */ lui $at, %hi(D_80AB8AE8) ## $at = 80AC0000 -/* 0149C 80AB6C1C 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 014A0 80AB6C20 A48F02A6 */ sh $t7, 0x02A6($a0) ## 000002A6 -/* 014A4 80AB6C24 A498025A */ sh $t8, 0x025A($a0) ## 0000025A -.L80AB6C28: -/* 014A8 80AB6C28 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 014AC 80AB6C2C C42C8AE8 */ lwc1 $f12, %lo(D_80AB8AE8)($at) -/* 014B0 80AB6C30 4600010D */ trunc.w.s $f4, $f0 -/* 014B4 80AB6C34 3C0180AC */ lui $at, %hi(D_80AB8AEC) ## $at = 80AC0000 -/* 014B8 80AB6C38 44082000 */ mfc1 $t0, $f4 -/* 014BC 80AB6C3C 00000000 */ nop -/* 014C0 80AB6C40 A60800B4 */ sh $t0, 0x00B4($s0) ## 000000B4 -/* 014C4 80AB6C44 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 014C8 80AB6C48 C42C8AEC */ lwc1 $f12, %lo(D_80AB8AEC)($at) -/* 014CC 80AB6C4C 4600018D */ trunc.w.s $f6, $f0 -/* 014D0 80AB6C50 3C0180AC */ lui $at, %hi(D_80AB8AF0) ## $at = 80AC0000 -/* 014D4 80AB6C54 440A3000 */ mfc1 $t2, $f6 -/* 014D8 80AB6C58 00000000 */ nop -/* 014DC 80AB6C5C A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -/* 014E0 80AB6C60 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 014E4 80AB6C64 C42C8AF0 */ lwc1 $f12, %lo(D_80AB8AF0)($at) -/* 014E8 80AB6C68 4600020D */ trunc.w.s $f8, $f0 -/* 014EC 80AB6C6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014F0 80AB6C70 440C4000 */ mfc1 $t4, $f8 -/* 014F4 80AB6C74 00000000 */ nop -/* 014F8 80AB6C78 A60C00B8 */ sh $t4, 0x00B8($s0) ## 000000B8 -/* 014FC 80AB6C7C 0C00BD68 */ jal Actor_HasNoParent -/* 01500 80AB6C80 8FA50024 */ lw $a1, 0x0024($sp) -/* 01504 80AB6C84 10400018 */ beq $v0, $zero, .L80AB6CE8 -/* 01508 80AB6C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0150C 80AB6C8C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 01510 80AB6C90 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01514 80AB6C94 3C0880AB */ lui $t0, %hi(func_80AB6D08) ## $t0 = 80AB0000 -/* 01518 80AB6C98 15A1000B */ bne $t5, $at, .L80AB6CC8 -/* 0151C 80AB6C9C 25086D08 */ addiu $t0, $t0, %lo(func_80AB6D08) ## $t0 = 80AB6D08 -/* 01520 80AB6CA0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01524 80AB6CA4 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 01528 80AB6CA8 3C0F80AB */ lui $t7, %hi(func_80AB6EB4) ## $t7 = 80AB0000 -/* 0152C 80AB6CAC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01530 80AB6CB0 25EF6EB4 */ addiu $t7, $t7, %lo(func_80AB6EB4) ## $t7 = 80AB6EB4 -/* 01534 80AB6CB4 A6000260 */ sh $zero, 0x0260($s0) ## 00000260 -/* 01538 80AB6CB8 A60E02A6 */ sh $t6, 0x02A6($s0) ## 000002A6 -/* 0153C 80AB6CBC AE0F0250 */ sw $t7, 0x0250($s0) ## 00000250 -/* 01540 80AB6CC0 1000000C */ beq $zero, $zero, .L80AB6CF4 -/* 01544 80AB6CC4 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -.L80AB6CC8: -/* 01548 80AB6CC8 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 0154C 80AB6CCC 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 -/* 01550 80AB6CD0 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 01554 80AB6CD4 AE080250 */ sw $t0, 0x0250($s0) ## 00000250 -/* 01558 80AB6CD8 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 0155C 80AB6CDC 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 01560 80AB6CE0 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 01564 80AB6CE4 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 -.L80AB6CE8: -/* 01568 80AB6CE8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0156C 80AB6CEC 0C2AD6FE */ jal func_80AB5BF8 -/* 01570 80AB6CF0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -.L80AB6CF4: -/* 01574 80AB6CF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01578 80AB6CF8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0157C 80AB6CFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01580 80AB6D00 03E00008 */ jr $ra -/* 01584 80AB6D04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s deleted file mode 100644 index 98daf50722..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s +++ /dev/null @@ -1,118 +0,0 @@ -glabel func_80AB6D08 -/* 01588 80AB6D08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0158C 80AB6D0C AFBF001C */ sw $ra, 0x001C($sp) -/* 01590 80AB6D10 AFB00018 */ sw $s0, 0x0018($sp) -/* 01594 80AB6D14 AFA50024 */ sw $a1, 0x0024($sp) -/* 01598 80AB6D18 848E02E8 */ lh $t6, 0x02E8($a0) ## 000002E8 -/* 0159C 80AB6D1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015A0 80AB6D20 55C0002C */ bnel $t6, $zero, .L80AB6DD4 -/* 015A4 80AB6D24 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 015A8 80AB6D28 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 -/* 015AC 80AB6D2C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 015B0 80AB6D30 5300005C */ beql $t8, $zero, .L80AB6EA4 -/* 015B4 80AB6D34 8FBF001C */ lw $ra, 0x001C($sp) -/* 015B8 80AB6D38 8499001C */ lh $t9, 0x001C($a0) ## 0000001C -/* 015BC 80AB6D3C 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 015C0 80AB6D40 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 015C4 80AB6D44 1721001A */ bne $t9, $at, .L80AB6DB0 -/* 015C8 80AB6D48 240A0050 */ addiu $t2, $zero, 0x0050 ## $t2 = 00000050 -/* 015CC 80AB6D4C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 015D0 80AB6D50 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 015D4 80AB6D54 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 015D8 80AB6D58 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 015DC 80AB6D5C A480029E */ sh $zero, 0x029E($a0) ## 0000029E -/* 015E0 80AB6D60 8482029E */ lh $v0, 0x029E($a0) ## 0000029E -/* 015E4 80AB6D64 3C0880AB */ lui $t0, %hi(func_80AB627C) ## $t0 = 80AB0000 -/* 015E8 80AB6D68 2508627C */ addiu $t0, $t0, %lo(func_80AB627C) ## $t0 = 80AB627C -/* 015EC 80AB6D6C E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 -/* 015F0 80AB6D70 E49002AC */ swc1 $f16, 0x02AC($a0) ## 000002AC -/* 015F4 80AB6D74 E48E02BC */ swc1 $f14, 0x02BC($a0) ## 000002BC -/* 015F8 80AB6D78 E48E02B0 */ swc1 $f14, 0x02B0($a0) ## 000002B0 -/* 015FC 80AB6D7C E48C02C0 */ swc1 $f12, 0x02C0($a0) ## 000002C0 -/* 01600 80AB6D80 E48C02B4 */ swc1 $f12, 0x02B4($a0) ## 000002B4 -/* 01604 80AB6D84 A482025A */ sh $v0, 0x025A($a0) ## 0000025A -/* 01608 80AB6D88 A482025C */ sh $v0, 0x025C($a0) ## 0000025C -/* 0160C 80AB6D8C E4920300 */ swc1 $f18, 0x0300($a0) ## 00000300 -/* 01610 80AB6D90 E49202FC */ swc1 $f18, 0x02FC($a0) ## 000002FC -/* 01614 80AB6D94 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 01618 80AB6D98 E492028C */ swc1 $f18, 0x028C($a0) ## 0000028C -/* 0161C 80AB6D9C E4920284 */ swc1 $f18, 0x0284($a0) ## 00000284 -/* 01620 80AB6DA0 E4920280 */ swc1 $f18, 0x0280($a0) ## 00000280 -/* 01624 80AB6DA4 E4920288 */ swc1 $f18, 0x0288($a0) ## 00000288 -/* 01628 80AB6DA8 1000003D */ beq $zero, $zero, .L80AB6EA0 -/* 0162C 80AB6DAC AC880250 */ sw $t0, 0x0250($a0) ## 00000250 -.L80AB6DB0: -/* 01630 80AB6DB0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01634 80AB6DB4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01638 80AB6DB8 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 0163C 80AB6DBC A60902E8 */ sh $t1, 0x02E8($s0) ## 000002E8 -/* 01640 80AB6DC0 A60A025C */ sh $t2, 0x025C($s0) ## 0000025C -/* 01644 80AB6DC4 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01648 80AB6DC8 10000015 */ beq $zero, $zero, .L80AB6E20 -/* 0164C 80AB6DCC E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 01650 80AB6DD0 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -.L80AB6DD4: -/* 01654 80AB6DD4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01658 80AB6DD8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0165C 80AB6DDC 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 01660 80AB6DE0 11800005 */ beq $t4, $zero, .L80AB6DF8 -/* 01664 80AB6DE4 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 01668 80AB6DE8 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 0166C 80AB6DEC A6000260 */ sh $zero, 0x0260($s0) ## 00000260 -/* 01670 80AB6DF0 A60D02A6 */ sh $t5, 0x02A6($s0) ## 000002A6 -/* 01674 80AB6DF4 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -.L80AB6DF8: -/* 01678 80AB6DF8 860E025C */ lh $t6, 0x025C($s0) ## 0000025C -/* 0167C 80AB6DFC 3C1880AB */ lui $t8, %hi(func_80AB7290) ## $t8 = 80AB0000 -/* 01680 80AB6E00 27187290 */ addiu $t8, $t8, %lo(func_80AB7290) ## $t8 = 80AB7290 -/* 01684 80AB6E04 55C00007 */ bnel $t6, $zero, .L80AB6E24 -/* 01688 80AB6E08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0168C 80AB6E0C A60F025E */ sh $t7, 0x025E($s0) ## 0000025E -/* 01690 80AB6E10 A600025A */ sh $zero, 0x025A($s0) ## 0000025A -/* 01694 80AB6E14 A60002E8 */ sh $zero, 0x02E8($s0) ## 000002E8 -/* 01698 80AB6E18 10000021 */ beq $zero, $zero, .L80AB6EA0 -/* 0169C 80AB6E1C AE180250 */ sw $t8, 0x0250($s0) ## 00000250 -.L80AB6E20: -/* 016A0 80AB6E20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AB6E24: -/* 016A4 80AB6E24 0C00BD04 */ jal Actor_HasParent -/* 016A8 80AB6E28 8FA50024 */ lw $a1, 0x0024($sp) -/* 016AC 80AB6E2C 10400011 */ beq $v0, $zero, .L80AB6E74 -/* 016B0 80AB6E30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B4 80AB6E34 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 016B8 80AB6E38 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 -/* 016BC 80AB6E3C 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 016C0 80AB6E40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 016C4 80AB6E44 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 016C8 80AB6E48 3C0980AB */ lui $t1, %hi(func_80AB6BF8) ## $t1 = 80AB0000 -/* 016CC 80AB6E4C 2402001E */ addiu $v0, $zero, 0x001E ## $v0 = 0000001E -/* 016D0 80AB6E50 25296BF8 */ addiu $t1, $t1, %lo(func_80AB6BF8) ## $t1 = 80AB6BF8 -/* 016D4 80AB6E54 03214024 */ and $t0, $t9, $at -/* 016D8 80AB6E58 A6020260 */ sh $v0, 0x0260($s0) ## 00000260 -/* 016DC 80AB6E5C A60002E8 */ sh $zero, 0x02E8($s0) ## 000002E8 -/* 016E0 80AB6E60 A602025A */ sh $v0, 0x025A($s0) ## 0000025A -/* 016E4 80AB6E64 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 016E8 80AB6E68 AE090250 */ sw $t1, 0x0250($s0) ## 00000250 -/* 016EC 80AB6E6C 1000000C */ beq $zero, $zero, .L80AB6EA0 -/* 016F0 80AB6E70 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80AB6E74: -/* 016F4 80AB6E74 860A025C */ lh $t2, 0x025C($s0) ## 0000025C -/* 016F8 80AB6E78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016FC 80AB6E7C 29410006 */ slti $at, $t2, 0x0006 -/* 01700 80AB6E80 54200004 */ bnel $at, $zero, .L80AB6E94 -/* 01704 80AB6E84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01708 80AB6E88 0C00BD60 */ jal func_8002F580 -/* 0170C 80AB6E8C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01710 80AB6E90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AB6E94: -/* 01714 80AB6E94 8FA50024 */ lw $a1, 0x0024($sp) -/* 01718 80AB6E98 0C2AD6FE */ jal func_80AB5BF8 -/* 0171C 80AB6E9C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -.L80AB6EA0: -/* 01720 80AB6EA0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AB6EA4: -/* 01724 80AB6EA4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01728 80AB6EA8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0172C 80AB6EAC 03E00008 */ jr $ra -/* 01730 80AB6EB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s deleted file mode 100644 index ce841f51ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AB6EB4 -/* 01734 80AB6EB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01738 80AB6EB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0173C 80AB6EBC AFA5001C */ sw $a1, 0x001C($sp) -/* 01740 80AB6EC0 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 01744 80AB6EC4 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 01748 80AB6EC8 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 0174C 80AB6ECC 4606203C */ c.lt.s $f4, $f6 -/* 01750 80AB6ED0 00000000 */ nop -/* 01754 80AB6ED4 45020005 */ bc1fl .L80AB6EEC -/* 01758 80AB6ED8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0175C 80AB6EDC 0C00B55C */ jal Actor_Kill - -/* 01760 80AB6EE0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01764 80AB6EE4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01768 80AB6EE8 8FA5001C */ lw $a1, 0x001C($sp) -.L80AB6EEC: -/* 0176C 80AB6EEC 0C2AD6FE */ jal func_80AB5BF8 -/* 01770 80AB6EF0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01774 80AB6EF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01778 80AB6EF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0177C 80AB6EFC 03E00008 */ jr $ra -/* 01780 80AB6F00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s deleted file mode 100644 index 3dd7cc0154..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s +++ /dev/null @@ -1,114 +0,0 @@ -glabel func_80AB6F04 -/* 01784 80AB6F04 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01788 80AB6F08 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0178C 80AB6F0C AFB00020 */ sw $s0, 0x0020($sp) -/* 01790 80AB6F10 AFA5003C */ sw $a1, 0x003C($sp) -/* 01794 80AB6F14 848E02A8 */ lh $t6, 0x02A8($a0) ## 000002A8 -/* 01798 80AB6F18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0179C 80AB6F1C 51C00004 */ beql $t6, $zero, .L80AB6F30 -/* 017A0 80AB6F20 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 017A4 80AB6F24 0C2AD7E8 */ jal func_80AB5FA0 -/* 017A8 80AB6F28 00000000 */ nop -/* 017AC 80AB6F2C 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -.L80AB6F30: -/* 017B0 80AB6F30 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 017B4 80AB6F34 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 017B8 80AB6F38 304F0020 */ andi $t7, $v0, 0x0020 ## $t7 = 00000000 -/* 017BC 80AB6F3C 11E0002A */ beq $t7, $zero, .L80AB6FE8 -/* 017C0 80AB6F40 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 017C4 80AB6F44 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 017C8 80AB6F48 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 017CC 80AB6F4C C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 017D0 80AB6F50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 017D4 80AB6F54 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 017D8 80AB6F58 4608303C */ c.lt.s $f6, $f8 -/* 017DC 80AB6F5C 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 017E0 80AB6F60 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 017E4 80AB6F64 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 017E8 80AB6F68 45020005 */ bc1fl .L80AB6F80 -/* 017EC 80AB6F6C 8618025A */ lh $t8, 0x025A($s0) ## 0000025A -/* 017F0 80AB6F70 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 017F4 80AB6F74 46005400 */ add.s $f16, $f10, $f0 -/* 017F8 80AB6F78 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 017FC 80AB6F7C 8618025A */ lh $t8, 0x025A($s0) ## 0000025A -.L80AB6F80: -/* 01800 80AB6F80 5700000F */ bnel $t8, $zero, .L80AB6FC0 -/* 01804 80AB6F84 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 01808 80AB6F88 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 0180C 80AB6F8C A619025A */ sh $t9, 0x025A($s0) ## 0000025A -/* 01810 80AB6F90 C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 01814 80AB6F94 C6040084 */ lwc1 $f4, 0x0084($s0) ## 00000084 -/* 01818 80AB6F98 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0181C 80AB6F9C AFA80010 */ sw $t0, 0x0010($sp) -/* 01820 80AB6FA0 46049180 */ add.s $f6, $f18, $f4 -/* 01824 80AB6FA4 8FA4003C */ lw $a0, 0x003C($sp) -/* 01828 80AB6FA8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 0182C 80AB6FAC 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 01830 80AB6FB0 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 01834 80AB6FB4 0C00A511 */ jal EffectSsGRipple_Spawn -/* 01838 80AB6FB8 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 0183C 80AB6FBC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -.L80AB6FC0: -/* 01840 80AB6FC0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01844 80AB6FC4 312A0008 */ andi $t2, $t1, 0x0008 ## $t2 = 00000000 -/* 01848 80AB6FC8 5140002D */ beql $t2, $zero, .L80AB7080 -/* 0184C 80AB6FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01850 80AB6FD0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01854 80AB6FD4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01858 80AB6FD8 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 0185C 80AB6FDC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 01860 80AB6FE0 10000026 */ beq $zero, $zero, .L80AB707C -/* 01864 80AB6FE4 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L80AB6FE8: -/* 01868 80AB6FE8 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 0186C 80AB6FEC 44810000 */ mtc1 $at, $f0 ## $f0 = -2.00 -/* 01870 80AB6FF0 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 01874 80AB6FF4 1160000A */ beq $t3, $zero, .L80AB7020 -/* 01878 80AB6FF8 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 0187C 80AB6FFC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01880 80AB7000 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 01884 80AB7004 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01888 80AB7008 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 0188C 80AB700C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01890 80AB7010 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 01894 80AB7014 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 01898 80AB7018 10000005 */ beq $zero, $zero, .L80AB7030 -/* 0189C 80AB701C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -.L80AB7020: -/* 018A0 80AB7020 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 018A4 80AB7024 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 018A8 80AB7028 00000000 */ nop -/* 018AC 80AB702C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80AB7030: -/* 018B0 80AB7030 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 018B4 80AB7034 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 018B8 80AB7038 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 018BC 80AB703C 51A00010 */ beql $t5, $zero, .L80AB7080 -/* 018C0 80AB7040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C4 80AB7044 860F02A8 */ lh $t7, 0x02A8($s0) ## 000002A8 -/* 018C8 80AB7048 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 018CC 80AB704C E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 018D0 80AB7050 A60E025E */ sh $t6, 0x025E($s0) ## 0000025E -/* 018D4 80AB7054 A600025A */ sh $zero, 0x025A($s0) ## 0000025A -/* 018D8 80AB7058 15E00005 */ bne $t7, $zero, .L80AB7070 -/* 018DC 80AB705C E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 018E0 80AB7060 3C1880AB */ lui $t8, %hi(func_80AB7290) ## $t8 = 80AB0000 -/* 018E4 80AB7064 27187290 */ addiu $t8, $t8, %lo(func_80AB7290) ## $t8 = 80AB7290 -/* 018E8 80AB7068 10000004 */ beq $zero, $zero, .L80AB707C -/* 018EC 80AB706C AE180250 */ sw $t8, 0x0250($s0) ## 00000250 -.L80AB7070: -/* 018F0 80AB7070 3C1980AB */ lui $t9, %hi(func_80AB7204) ## $t9 = 80AB0000 -/* 018F4 80AB7074 27397204 */ addiu $t9, $t9, %lo(func_80AB7204) ## $t9 = 80AB7204 -/* 018F8 80AB7078 AE190250 */ sw $t9, 0x0250($s0) ## 00000250 -.L80AB707C: -/* 018FC 80AB707C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AB7080: -/* 01900 80AB7080 8FA5003C */ lw $a1, 0x003C($sp) -/* 01904 80AB7084 0C2AD6FE */ jal func_80AB5BF8 -/* 01908 80AB7088 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0190C 80AB708C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01910 80AB7090 8FB00020 */ lw $s0, 0x0020($sp) -/* 01914 80AB7094 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01918 80AB7098 03E00008 */ jr $ra -/* 0191C 80AB709C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s deleted file mode 100644 index 19ecd57fbf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AB70A0 -/* 01920 80AB70A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01924 80AB70A4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01928 80AB70A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0192C 80AB70AC AFA50024 */ sw $a1, 0x0024($sp) -/* 01930 80AB70B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01934 80AB70B4 240508F2 */ addiu $a1, $zero, 0x08F2 ## $a1 = 000008F2 -/* 01938 80AB70B8 AFA70020 */ sw $a3, 0x0020($sp) -/* 0193C 80AB70BC AFA00010 */ sw $zero, 0x0010($sp) -/* 01940 80AB70C0 0C02003E */ jal func_800800F8 -/* 01944 80AB70C4 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 01948 80AB70C8 8FA70020 */ lw $a3, 0x0020($sp) -/* 0194C 80AB70CC 3C1880AB */ lui $t8, %hi(func_80AB70F8) ## $t8 = 80AB0000 -/* 01950 80AB70D0 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01954 80AB70D4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01958 80AB70D8 271870F8 */ addiu $t8, $t8, %lo(func_80AB70F8) ## $t8 = 80AB70F8 -/* 0195C 80AB70DC A4EE025C */ sh $t6, 0x025C($a3) ## 0000025C -/* 01960 80AB70E0 A4EF02A2 */ sh $t7, 0x02A2($a3) ## 000002A2 -/* 01964 80AB70E4 ACF80250 */ sw $t8, 0x0250($a3) ## 00000250 -/* 01968 80AB70E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0196C 80AB70EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01970 80AB70F0 03E00008 */ jr $ra -/* 01974 80AB70F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s deleted file mode 100644 index 35568bb161..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AB70F8 -/* 01978 80AB70F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0197C 80AB70FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01980 80AB7100 848F025C */ lh $t7, 0x025C($a0) ## 0000025C -/* 01984 80AB7104 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01988 80AB7108 A48E0260 */ sh $t6, 0x0260($a0) ## 00000260 -/* 0198C 80AB710C 15E00009 */ bne $t7, $zero, .L80AB7134 -/* 01990 80AB7110 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 01994 80AB7114 3C0980AB */ lui $t1, %hi(func_80AB714C) ## $t1 = 80AB0000 -/* 01998 80AB7118 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 0199C 80AB711C 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 019A0 80AB7120 2529714C */ addiu $t1, $t1, %lo(func_80AB714C) ## $t1 = 80AB714C -/* 019A4 80AB7124 A498025C */ sh $t8, 0x025C($a0) ## 0000025C -/* 019A8 80AB7128 A4990254 */ sh $t9, 0x0254($a0) ## 00000254 -/* 019AC 80AB712C A48802A2 */ sh $t0, 0x02A2($a0) ## 000002A2 -/* 019B0 80AB7130 AC890250 */ sw $t1, 0x0250($a0) ## 00000250 -.L80AB7134: -/* 019B4 80AB7134 0C2AD6FE */ jal func_80AB5BF8 -/* 019B8 80AB7138 848602A2 */ lh $a2, 0x02A2($a0) ## 000002A2 -/* 019BC 80AB713C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 019C0 80AB7140 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 019C4 80AB7144 03E00008 */ jr $ra -/* 019C8 80AB7148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s deleted file mode 100644 index 8b97495a6e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s +++ /dev/null @@ -1,58 +0,0 @@ -.late_rodata -glabel D_80AB8AF4 - .float 14000.0 - -glabel D_80AB8AF8 - .float 10000.0 - -.text -glabel func_80AB714C -/* 019CC 80AB714C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 019D0 80AB7150 AFBF0014 */ sw $ra, 0x0014($sp) -/* 019D4 80AB7154 AFA5001C */ sw $a1, 0x001C($sp) -/* 019D8 80AB7158 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 019DC 80AB715C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 019E0 80AB7160 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 019E4 80AB7164 14410014 */ bne $v0, $at, .L80AB71B8 -/* 019E8 80AB7168 A48E0260 */ sh $t6, 0x0260($a0) ## 00000260 -/* 019EC 80AB716C 3C0180AC */ lui $at, %hi(D_80AB8AF4) ## $at = 80AC0000 -/* 019F0 80AB7170 C4228AF4 */ lwc1 $f2, %lo(D_80AB8AF4)($at) -/* 019F4 80AB7174 3C0180AC */ lui $at, %hi(D_80AB8AF8) ## $at = 80AC0000 -/* 019F8 80AB7178 C4248AF8 */ lwc1 $f4, %lo(D_80AB8AF8)($at) -/* 019FC 80AB717C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01A00 80AB7180 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 01A04 80AB7184 A48F0254 */ sh $t7, 0x0254($a0) ## 00000254 -/* 01A08 80AB7188 E4820288 */ swc1 $f2, 0x0288($a0) ## 00000288 -/* 01A0C 80AB718C E4820280 */ swc1 $f2, 0x0280($a0) ## 00000280 -/* 01A10 80AB7190 E484026C */ swc1 $f4, 0x026C($a0) ## 0000026C -/* 01A14 80AB7194 E4800284 */ swc1 $f0, 0x0284($a0) ## 00000284 -/* 01A18 80AB7198 E480028C */ swc1 $f0, 0x028C($a0) ## 0000028C -/* 01A1C 80AB719C E4800270 */ swc1 $f0, 0x0270($a0) ## 00000270 -/* 01A20 80AB71A0 E4800274 */ swc1 $f0, 0x0274($a0) ## 00000274 -/* 01A24 80AB71A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A28 80AB71A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01A2C 80AB71AC 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 -/* 01A30 80AB71B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A34 80AB71B4 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -.L80AB71B8: -/* 01A38 80AB71B8 1440000B */ bne $v0, $zero, .L80AB71E8 -/* 01A3C 80AB71BC 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 01A40 80AB71C0 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 -/* 01A44 80AB71C4 8499008A */ lh $t9, 0x008A($a0) ## 0000008A -/* 01A48 80AB71C8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 01A4C 80AB71CC 3C0A80AB */ lui $t2, %hi(func_80AB7204) ## $t2 = 80AB0000 -/* 01A50 80AB71D0 254A7204 */ addiu $t2, $t2, %lo(func_80AB7204) ## $t2 = 80AB7204 -/* 01A54 80AB71D4 01014824 */ and $t1, $t0, $at -/* 01A58 80AB71D8 A4980266 */ sh $t8, 0x0266($a0) ## 00000266 -/* 01A5C 80AB71DC AC890004 */ sw $t1, 0x0004($a0) ## 00000004 -/* 01A60 80AB71E0 AC8A0250 */ sw $t2, 0x0250($a0) ## 00000250 -/* 01A64 80AB71E4 A49902E4 */ sh $t9, 0x02E4($a0) ## 000002E4 -.L80AB71E8: -/* 01A68 80AB71E8 8FA5001C */ lw $a1, 0x001C($sp) -/* 01A6C 80AB71EC 0C2AD6FE */ jal func_80AB5BF8 -/* 01A70 80AB71F0 848602A2 */ lh $a2, 0x02A2($a0) ## 000002A2 -/* 01A74 80AB71F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A78 80AB71F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A7C 80AB71FC 03E00008 */ jr $ra -/* 01A80 80AB7200 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s deleted file mode 100644 index 69d742dd06..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s +++ /dev/null @@ -1,44 +0,0 @@ -.late_rodata -glabel D_80AB8AFC - .float 1.99000000954 - -.text -glabel func_80AB7204 -/* 01A84 80AB7204 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A88 80AB7208 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A8C 80AB720C AFA5001C */ sw $a1, 0x001C($sp) -/* 01A90 80AB7210 0C2AD7E8 */ jal func_80AB5FA0 -/* 01A94 80AB7214 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A98 80AB7218 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A9C 80AB721C 84820266 */ lh $v0, 0x0266($a0) ## 00000266 -/* 01AA0 80AB7220 28410002 */ slti $at, $v0, 0x0002 -/* 01AA4 80AB7224 10200016 */ beq $at, $zero, .L80AB7280 -/* 01AA8 80AB7228 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01AAC 80AB722C 14410012 */ bne $v0, $at, .L80AB7278 -/* 01AB0 80AB7230 8FA5001C */ lw $a1, 0x001C($sp) -/* 01AB4 80AB7234 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01AB8 80AB7238 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 01ABC 80AB723C 3C0180AC */ lui $at, %hi(D_80AB8AFC) ## $at = 80AC0000 -/* 01AC0 80AB7240 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01AC4 80AB7244 AFA40018 */ sw $a0, 0x0018($sp) -/* 01AC8 80AB7248 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01ACC 80AB724C C42C8AFC */ lwc1 $f12, %lo(D_80AB8AFC)($at) -/* 01AD0 80AB7250 8FA40018 */ lw $a0, 0x0018($sp) -/* 01AD4 80AB7254 4600018D */ trunc.w.s $f6, $f0 -/* 01AD8 80AB7258 A480025A */ sh $zero, 0x025A($a0) ## 0000025A -/* 01ADC 80AB725C 8482025A */ lh $v0, 0x025A($a0) ## 0000025A -/* 01AE0 80AB7260 440F3000 */ mfc1 $t7, $f6 -/* 01AE4 80AB7264 A4820258 */ sh $v0, 0x0258($a0) ## 00000258 -/* 01AE8 80AB7268 A4820256 */ sh $v0, 0x0256($a0) ## 00000256 -/* 01AEC 80AB726C A4820254 */ sh $v0, 0x0254($a0) ## 00000254 -/* 01AF0 80AB7270 10000003 */ beq $zero, $zero, .L80AB7280 -/* 01AF4 80AB7274 A48F02A0 */ sh $t7, 0x02A0($a0) ## 000002A0 -.L80AB7278: -/* 01AF8 80AB7278 0C2AD840 */ jal func_80AB6100 -/* 01AFC 80AB727C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80AB7280: -/* 01B00 80AB7280 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B04 80AB7284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B08 80AB7288 03E00008 */ jr $ra -/* 01B0C 80AB728C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s deleted file mode 100644 index 947fcdccfe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s +++ /dev/null @@ -1,47 +0,0 @@ -.late_rodata -glabel D_80AB8B00 - .float 1.99000000954 - -.text -glabel func_80AB7290 -/* 01B10 80AB7290 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B14 80AB7294 AFA40028 */ sw $a0, 0x0028($sp) -/* 01B18 80AB7298 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B1C 80AB729C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01B20 80AB72A0 AFA5002C */ sw $a1, 0x002C($sp) -/* 01B24 80AB72A4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01B28 80AB72A8 248400E8 */ addiu $a0, $a0, 0x00E8 ## $a0 = 060000E8 -/* 01B2C 80AB72AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01B30 80AB72B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B34 80AB72B4 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01B38 80AB72B8 468021A0 */ cvt.s.w $f6, $f4 -/* 01B3C 80AB72BC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B40 80AB72C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B44 80AB72C4 24A500E8 */ addiu $a1, $a1, 0x00E8 ## $a1 = 060000E8 -/* 01B48 80AB72C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B4C 80AB72CC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01B50 80AB72D0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01B54 80AB72D4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01B58 80AB72D8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01B5C 80AB72DC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01B60 80AB72E0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B64 80AB72E4 3C0180AC */ lui $at, %hi(D_80AB8B00) ## $at = 80AC0000 -/* 01B68 80AB72E8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01B6C 80AB72EC C42C8B00 */ lwc1 $f12, %lo(D_80AB8B00)($at) -/* 01B70 80AB72F0 4600028D */ trunc.w.s $f10, $f0 -/* 01B74 80AB72F4 8FA20028 */ lw $v0, 0x0028($sp) -/* 01B78 80AB72F8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01B7C 80AB72FC 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 -/* 01B80 80AB7300 440F5000 */ mfc1 $t7, $f10 -/* 01B84 80AB7304 3C1880AB */ lui $t8, %hi(func_80AB7328) ## $t8 = 80AB0000 -/* 01B88 80AB7308 27187328 */ addiu $t8, $t8, %lo(func_80AB7328) ## $t8 = 80AB7328 -/* 01B8C 80AB730C AC580250 */ sw $t8, 0x0250($v0) ## 00000250 -/* 01B90 80AB7310 E4500068 */ swc1 $f16, 0x0068($v0) ## 00000068 -/* 01B94 80AB7314 A44F02A0 */ sh $t7, 0x02A0($v0) ## 000002A0 -/* 01B98 80AB7318 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01B9C 80AB731C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BA0 80AB7320 03E00008 */ jr $ra -/* 01BA4 80AB7324 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s deleted file mode 100644 index 7f8af06c09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s +++ /dev/null @@ -1,71 +0,0 @@ -.late_rodata -glabel D_80AB8B04 - .float 10430.378 - -.text -glabel func_80AB7328 -/* 01BA8 80AB7328 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01BAC 80AB732C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01BB0 80AB7330 AFA5001C */ sw $a1, 0x001C($sp) -/* 01BB4 80AB7334 848F025E */ lh $t7, 0x025E($a0) ## 0000025E -/* 01BB8 80AB7338 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01BBC 80AB733C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01BC0 80AB7340 15E0001C */ bne $t7, $zero, .L80AB73B4 -/* 01BC4 80AB7344 3C1980AB */ lui $t9, %hi(func_80AB627C) ## $t9 = 80AB0000 -/* 01BC8 80AB7348 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01BCC 80AB734C C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 01BD0 80AB7350 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 01BD4 80AB7354 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 01BD8 80AB7358 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 01BDC 80AB735C A480029E */ sh $zero, 0x029E($a0) ## 0000029E -/* 01BE0 80AB7360 8482029E */ lh $v0, 0x029E($a0) ## 0000029E -/* 01BE4 80AB7364 E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 -/* 01BE8 80AB7368 E49002AC */ swc1 $f16, 0x02AC($a0) ## 000002AC -/* 01BEC 80AB736C E48E02BC */ swc1 $f14, 0x02BC($a0) ## 000002BC -/* 01BF0 80AB7370 E48E02B0 */ swc1 $f14, 0x02B0($a0) ## 000002B0 -/* 01BF4 80AB7374 E48C02C0 */ swc1 $f12, 0x02C0($a0) ## 000002C0 -/* 01BF8 80AB7378 E48C02B4 */ swc1 $f12, 0x02B4($a0) ## 000002B4 -/* 01BFC 80AB737C A482025A */ sh $v0, 0x025A($a0) ## 0000025A -/* 01C00 80AB7380 A482025C */ sh $v0, 0x025C($a0) ## 0000025C -/* 01C04 80AB7384 E4920300 */ swc1 $f18, 0x0300($a0) ## 00000300 -/* 01C08 80AB7388 E49202FC */ swc1 $f18, 0x02FC($a0) ## 000002FC -/* 01C0C 80AB738C E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 01C10 80AB7390 E492028C */ swc1 $f18, 0x028C($a0) ## 0000028C -/* 01C14 80AB7394 E4920284 */ swc1 $f18, 0x0284($a0) ## 00000284 -/* 01C18 80AB7398 E4920280 */ swc1 $f18, 0x0280($a0) ## 00000280 -/* 01C1C 80AB739C 17010002 */ bne $t8, $at, .L80AB73A8 -/* 01C20 80AB73A0 E4920288 */ swc1 $f18, 0x0288($a0) ## 00000288 -/* 01C24 80AB73A4 A480001C */ sh $zero, 0x001C($a0) ## 0000001C -.L80AB73A8: -/* 01C28 80AB73A8 2739627C */ addiu $t9, $t9, %lo(func_80AB627C) ## $t9 = 80AB627C -/* 01C2C 80AB73AC 10000018 */ beq $zero, $zero, .L80AB7410 -/* 01C30 80AB73B0 AC990250 */ sw $t9, 0x0250($a0) ## 00000250 -.L80AB73B4: -/* 01C34 80AB73B4 C4920024 */ lwc1 $f18, 0x0024($a0) ## 00000024 -/* 01C38 80AB73B8 C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 -/* 01C3C 80AB73BC C48A002C */ lwc1 $f10, 0x002C($a0) ## 0000002C -/* 01C40 80AB73C0 C448002C */ lwc1 $f8, 0x002C($v0) ## 0000002C -/* 01C44 80AB73C4 46109301 */ sub.s $f12, $f18, $f16 -/* 01C48 80AB73C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 01C4C 80AB73CC 0C03F494 */ jal Math_atan2f -/* 01C50 80AB73D0 46085381 */ sub.s $f14, $f10, $f8 -/* 01C54 80AB73D4 3C0180AC */ lui $at, %hi(D_80AB8B04) ## $at = 80AC0000 -/* 01C58 80AB73D8 C4308B04 */ lwc1 $f16, %lo(D_80AB8B04)($at) -/* 01C5C 80AB73DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C60 80AB73E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01C64 80AB73E4 46100482 */ mul.s $f18, $f0, $f16 -/* 01C68 80AB73E8 4600910D */ trunc.w.s $f4, $f18 -/* 01C6C 80AB73EC 44092000 */ mfc1 $t1, $f4 -/* 01C70 80AB73F0 00000000 */ nop -/* 01C74 80AB73F4 A48902E4 */ sh $t1, 0x02E4($a0) ## 000002E4 -/* 01C78 80AB73F8 0C2AD840 */ jal func_80AB6100 -/* 01C7C 80AB73FC 8FA5001C */ lw $a1, 0x001C($sp) -/* 01C80 80AB7400 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C84 80AB7404 8FA5001C */ lw $a1, 0x001C($sp) -/* 01C88 80AB7408 0C2AD6FE */ jal func_80AB5BF8 -/* 01C8C 80AB740C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -.L80AB7410: -/* 01C90 80AB7410 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C94 80AB7414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C98 80AB7418 03E00008 */ jr $ra -/* 01C9C 80AB741C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s deleted file mode 100644 index 988a5710ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s +++ /dev/null @@ -1,31 +0,0 @@ -.late_rodata -glabel D_80AB8B08 - .float 3.99 - -.text -glabel func_80AB7420 -/* 01CA0 80AB7420 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01CA4 80AB7424 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CA8 80AB7428 AFA5001C */ sw $a1, 0x001C($sp) -/* 01CAC 80AB742C 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 01CB0 80AB7430 3C0180AC */ lui $at, %hi(D_80AB8B08) ## $at = 80AC0000 -/* 01CB4 80AB7434 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 01CB8 80AB7438 51E0000D */ beql $t7, $zero, .L80AB7470 -/* 01CBC 80AB743C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CC0 80AB7440 C42C8B08 */ lwc1 $f12, %lo(D_80AB8B08)($at) -/* 01CC4 80AB7444 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01CC8 80AB7448 AFA40018 */ sw $a0, 0x0018($sp) -/* 01CCC 80AB744C 4600010D */ trunc.w.s $f4, $f0 -/* 01CD0 80AB7450 8FA40018 */ lw $a0, 0x0018($sp) -/* 01CD4 80AB7454 3C0B80AB */ lui $t3, %hi(func_80AB627C) ## $t3 = 80AB0000 -/* 01CD8 80AB7458 256B627C */ addiu $t3, $t3, %lo(func_80AB627C) ## $t3 = 80AB627C -/* 01CDC 80AB745C 44092000 */ mfc1 $t1, $f4 -/* 01CE0 80AB7460 AC8B0250 */ sw $t3, 0x0250($a0) ## 00000250 -/* 01CE4 80AB7464 252A0005 */ addiu $t2, $t1, 0x0005 ## $t2 = 00000005 -/* 01CE8 80AB7468 A48A02A4 */ sh $t2, 0x02A4($a0) ## 000002A4 -/* 01CEC 80AB746C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AB7470: -/* 01CF0 80AB7470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CF4 80AB7474 03E00008 */ jr $ra -/* 01CF8 80AB7478 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s deleted file mode 100644 index a75071f681..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AB747C -/* 01CFC 80AB747C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D00 80AB7480 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D04 80AB7484 AFA5001C */ sw $a1, 0x001C($sp) -/* 01D08 80AB7488 848E02A8 */ lh $t6, 0x02A8($a0) ## 000002A8 -/* 01D0C 80AB748C 55C00026 */ bnel $t6, $zero, .L80AB7528 -/* 01D10 80AB7490 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D14 80AB7494 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 01D18 80AB7498 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01D1C 80AB749C 51E10022 */ beql $t7, $at, .L80AB7528 -/* 01D20 80AB74A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D24 80AB74A4 8C990250 */ lw $t9, 0x0250($a0) ## 00000250 -/* 01D28 80AB74A8 3C1880AB */ lui $t8, %hi(func_80AB6450) ## $t8 = 80AB0000 -/* 01D2C 80AB74AC 27186450 */ addiu $t8, $t8, %lo(func_80AB6450) ## $t8 = 80AB6450 -/* 01D30 80AB74B0 5319001D */ beql $t8, $t9, .L80AB7528 -/* 01D34 80AB74B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D38 80AB74B8 9082031D */ lbu $v0, 0x031D($a0) ## 0000031D -/* 01D3C 80AB74BC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01D40 80AB74C0 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 -/* 01D44 80AB74C4 30480002 */ andi $t0, $v0, 0x0002 ## $t0 = 00000000 -/* 01D48 80AB74C8 11000016 */ beq $t0, $zero, .L80AB7524 -/* 01D4C 80AB74CC 3049FFFD */ andi $t1, $v0, 0xFFFD ## $t1 = 00000000 -/* 01D50 80AB74D0 848302A4 */ lh $v1, 0x02A4($a0) ## 000002A4 -/* 01D54 80AB74D4 240A001E */ addiu $t2, $zero, 0x001E ## $t2 = 0000001E -/* 01D58 80AB74D8 A089031D */ sb $t1, 0x031D($a0) ## 0000031D -/* 01D5C 80AB74DC 18600007 */ blez $v1, .L80AB74FC -/* 01D60 80AB74E0 A48A0260 */ sh $t2, 0x0260($a0) ## 00000260 -/* 01D64 80AB74E4 3C0B80AC */ lui $t3, %hi(D_80AB85E0) ## $t3 = 80AC0000 -/* 01D68 80AB74E8 856B85E0 */ lh $t3, %lo(D_80AB85E0)($t3) -/* 01D6C 80AB74EC 246CFFFF */ addiu $t4, $v1, 0xFFFF ## $t4 = FFFFFFFF -/* 01D70 80AB74F0 55600003 */ bnel $t3, $zero, .L80AB7500 -/* 01D74 80AB74F4 A48D02A6 */ sh $t5, 0x02A6($a0) ## 000002A6 -/* 01D78 80AB74F8 A48C02A4 */ sh $t4, 0x02A4($a0) ## 000002A4 -.L80AB74FC: -/* 01D7C 80AB74FC A48D02A6 */ sh $t5, 0x02A6($a0) ## 000002A6 -.L80AB7500: -/* 01D80 80AB7500 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D84 80AB7504 AFA40018 */ sw $a0, 0x0018($sp) -/* 01D88 80AB7508 8FA40018 */ lw $a0, 0x0018($sp) -/* 01D8C 80AB750C 3C0F80AB */ lui $t7, %hi(func_80AB7290) ## $t7 = 80AB0000 -/* 01D90 80AB7510 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01D94 80AB7514 25EF7290 */ addiu $t7, $t7, %lo(func_80AB7290) ## $t7 = 80AB7290 -/* 01D98 80AB7518 A48E025E */ sh $t6, 0x025E($a0) ## 0000025E -/* 01D9C 80AB751C A48002E8 */ sh $zero, 0x02E8($a0) ## 000002E8 -/* 01DA0 80AB7520 AC8F0250 */ sw $t7, 0x0250($a0) ## 00000250 -.L80AB7524: -/* 01DA4 80AB7524 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AB7528: -/* 01DA8 80AB7528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DAC 80AB752C 03E00008 */ jr $ra -/* 01DB0 80AB7530 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s deleted file mode 100644 index 52b303f518..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80AB7F60 -/* 027E0 80AB7F60 27BDFFF0 */ addiu $sp, $sp, 0xFFF0 ## $sp = FFFFFFF0 -/* 027E4 80AB7F64 3C0F80AC */ lui $t7, %hi(D_80AB8700) ## $t7 = 80AC0000 -/* 027E8 80AB7F68 AFA40010 */ sw $a0, 0x0010($sp) -/* 027EC 80AB7F6C AFA60018 */ sw $a2, 0x0018($sp) -/* 027F0 80AB7F70 AFA7001C */ sw $a3, 0x001C($sp) -/* 027F4 80AB7F74 25EF8700 */ addiu $t7, $t7, %lo(D_80AB8700) ## $t7 = 80AB8700 -/* 027F8 80AB7F78 8DF90000 */ lw $t9, 0x0000($t7) ## 80AB8700 -/* 027FC 80AB7F7C 27AE0000 */ addiu $t6, $sp, 0x0000 ## $t6 = FFFFFFF0 -/* 02800 80AB7F80 8DF80004 */ lw $t8, 0x0004($t7) ## 80AB8704 -/* 02804 80AB7F84 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 02808 80AB7F88 8DF90008 */ lw $t9, 0x0008($t7) ## 80AB8708 -/* 0280C 80AB7F8C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 02810 80AB7F90 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 02814 80AB7F94 14A1000A */ bne $a1, $at, .L80AB7FC0 -/* 02818 80AB7F98 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 0281C 80AB7F9C 8FA20024 */ lw $v0, 0x0024($sp) -/* 02820 80AB7FA0 8FA30020 */ lw $v1, 0x0020($sp) -/* 02824 80AB7FA4 C44402DC */ lwc1 $f4, 0x02DC($v0) ## 000002DC -/* 02828 80AB7FA8 84680002 */ lh $t0, 0x0002($v1) ## 00000002 -/* 0282C 80AB7FAC 4600218D */ trunc.w.s $f6, $f4 -/* 02830 80AB7FB0 440C3000 */ mfc1 $t4, $f6 -/* 02834 80AB7FB4 00000000 */ nop -/* 02838 80AB7FB8 010C6821 */ addu $t5, $t0, $t4 -/* 0283C 80AB7FBC A46D0002 */ sh $t5, 0x0002($v1) ## 00000002 -.L80AB7FC0: -/* 02840 80AB7FC0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 02844 80AB7FC4 8FA20024 */ lw $v0, 0x0024($sp) -/* 02848 80AB7FC8 14A10008 */ bne $a1, $at, .L80AB7FEC -/* 0284C 80AB7FCC 8FA30020 */ lw $v1, 0x0020($sp) -/* 02850 80AB7FD0 C44802E0 */ lwc1 $f8, 0x02E0($v0) ## 000002E0 -/* 02854 80AB7FD4 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 -/* 02858 80AB7FD8 4600428D */ trunc.w.s $f10, $f8 -/* 0285C 80AB7FDC 44095000 */ mfc1 $t1, $f10 -/* 02860 80AB7FE0 00000000 */ nop -/* 02864 80AB7FE4 01C95021 */ addu $t2, $t6, $t1 -/* 02868 80AB7FE8 A46A0002 */ sh $t2, 0x0002($v1) ## 00000002 -.L80AB7FEC: -/* 0286C 80AB7FEC 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 02870 80AB7FF0 54A10017 */ bnel $a1, $at, .L80AB8050 -/* 02874 80AB7FF4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02878 80AB7FF8 C45002D8 */ lwc1 $f16, 0x02D8($v0) ## 000002D8 -/* 0287C 80AB7FFC 846B0000 */ lh $t3, 0x0000($v1) ## 00000000 -/* 02880 80AB8000 84790002 */ lh $t9, 0x0002($v1) ## 00000002 -/* 02884 80AB8004 4600848D */ trunc.w.s $f18, $f16 -/* 02888 80AB8008 846D0004 */ lh $t5, 0x0004($v1) ## 00000004 -/* 0288C 80AB800C 440F9000 */ mfc1 $t7, $f18 -/* 02890 80AB8010 00000000 */ nop -/* 02894 80AB8014 016FC021 */ addu $t8, $t3, $t7 -/* 02898 80AB8018 A4780000 */ sh $t8, 0x0000($v1) ## 00000000 -/* 0289C 80AB801C C44402D4 */ lwc1 $f4, 0x02D4($v0) ## 000002D4 -/* 028A0 80AB8020 4600218D */ trunc.w.s $f6, $f4 -/* 028A4 80AB8024 44083000 */ mfc1 $t0, $f6 -/* 028A8 80AB8028 00000000 */ nop -/* 028AC 80AB802C 03286021 */ addu $t4, $t9, $t0 -/* 028B0 80AB8030 A46C0002 */ sh $t4, 0x0002($v1) ## 00000002 -/* 028B4 80AB8034 C44802D0 */ lwc1 $f8, 0x02D0($v0) ## 000002D0 -/* 028B8 80AB8038 4600428D */ trunc.w.s $f10, $f8 -/* 028BC 80AB803C 440E5000 */ mfc1 $t6, $f10 -/* 028C0 80AB8040 00000000 */ nop -/* 028C4 80AB8044 01AE4821 */ addu $t1, $t5, $t6 -/* 028C8 80AB8048 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 -/* 028CC 80AB804C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -.L80AB8050: -/* 028D0 80AB8050 54A10017 */ bnel $a1, $at, .L80AB80B0 -/* 028D4 80AB8054 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 028D8 80AB8058 C45002CC */ lwc1 $f16, 0x02CC($v0) ## 000002CC -/* 028DC 80AB805C 846A0000 */ lh $t2, 0x0000($v1) ## 00000000 -/* 028E0 80AB8060 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 028E4 80AB8064 4600848D */ trunc.w.s $f18, $f16 -/* 028E8 80AB8068 846C0004 */ lh $t4, 0x0004($v1) ## 00000004 -/* 028EC 80AB806C 440B9000 */ mfc1 $t3, $f18 -/* 028F0 80AB8070 00000000 */ nop -/* 028F4 80AB8074 014B7821 */ addu $t7, $t2, $t3 -/* 028F8 80AB8078 A46F0000 */ sh $t7, 0x0000($v1) ## 00000000 -/* 028FC 80AB807C C44402C8 */ lwc1 $f4, 0x02C8($v0) ## 000002C8 -/* 02900 80AB8080 4600218D */ trunc.w.s $f6, $f4 -/* 02904 80AB8084 44193000 */ mfc1 $t9, $f6 -/* 02908 80AB8088 00000000 */ nop -/* 0290C 80AB808C 03194021 */ addu $t0, $t8, $t9 -/* 02910 80AB8090 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 -/* 02914 80AB8094 C44802C4 */ lwc1 $f8, 0x02C4($v0) ## 000002C4 -/* 02918 80AB8098 4600428D */ trunc.w.s $f10, $f8 -/* 0291C 80AB809C 440D5000 */ mfc1 $t5, $f10 -/* 02920 80AB80A0 00000000 */ nop -/* 02924 80AB80A4 018D7021 */ addu $t6, $t4, $t5 -/* 02928 80AB80A8 A46E0004 */ sh $t6, 0x0004($v1) ## 00000004 -/* 0292C 80AB80AC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AB80B0: -/* 02930 80AB80B0 03E00008 */ jr $ra -/* 02934 80AB80B4 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s deleted file mode 100644 index ea241d9f5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80AB8168 -/* 029E8 80AB8168 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 029EC 80AB816C AFBF0014 */ sw $ra, 0x0014($sp) -/* 029F0 80AB8170 24830358 */ addiu $v1, $a0, 0x0358 ## $v1 = 00000358 -/* 029F4 80AB8174 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AB8178: -/* 029F8 80AB8178 906E0000 */ lbu $t6, 0x0000($v1) ## 00000358 -/* 029FC 80AB817C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 02A00 80AB8180 00021400 */ sll $v0, $v0, 16 -/* 02A04 80AB8184 15C0002D */ bne $t6, $zero, .L80AB823C -/* 02A08 80AB8188 00021403 */ sra $v0, $v0, 16 -/* 02A0C 80AB818C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02A10 80AB8190 A06F0000 */ sb $t7, 0x0000($v1) ## 00000358 -/* 02A14 80AB8194 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 02A18 80AB8198 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 02A1C 80AB819C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 02A20 80AB81A0 AC790004 */ sw $t9, 0x0004($v1) ## 0000035C -/* 02A24 80AB81A4 8CB80004 */ lw $t8, 0x0004($a1) ## 00000004 -/* 02A28 80AB81A8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02A2C 80AB81AC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 02A30 80AB81B0 AC780008 */ sw $t8, 0x0008($v1) ## 00000360 -/* 02A34 80AB81B4 8CB90008 */ lw $t9, 0x0008($a1) ## 00000008 -/* 02A38 80AB81B8 AC79000C */ sw $t9, 0x000C($v1) ## 00000364 -/* 02A3C 80AB81BC 8CC90000 */ lw $t1, 0x0000($a2) ## 00000000 -/* 02A40 80AB81C0 AC690010 */ sw $t1, 0x0010($v1) ## 00000368 -/* 02A44 80AB81C4 8CC80004 */ lw $t0, 0x0004($a2) ## 00000004 -/* 02A48 80AB81C8 AC680014 */ sw $t0, 0x0014($v1) ## 0000036C -/* 02A4C 80AB81CC 8CC90008 */ lw $t1, 0x0008($a2) ## 00000008 -/* 02A50 80AB81D0 AC690018 */ sw $t1, 0x0018($v1) ## 00000370 -/* 02A54 80AB81D4 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 02A58 80AB81D8 AC6B001C */ sw $t3, 0x001C($v1) ## 00000374 -/* 02A5C 80AB81DC 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 02A60 80AB81E0 AC6A0020 */ sw $t2, 0x0020($v1) ## 00000378 -/* 02A64 80AB81E4 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 02A68 80AB81E8 A0600034 */ sb $zero, 0x0034($v1) ## 0000038C -/* 02A6C 80AB81EC AC6B0024 */ sw $t3, 0x0024($v1) ## 0000037C -/* 02A70 80AB81F0 C7A40030 */ lwc1 $f4, 0x0030($sp) -/* 02A74 80AB81F4 46062203 */ div.s $f8, $f4, $f6 -/* 02A78 80AB81F8 E468002C */ swc1 $f8, 0x002C($v1) ## 00000384 -/* 02A7C 80AB81FC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 02A80 80AB8200 AFA30018 */ sw $v1, 0x0018($sp) -/* 02A84 80AB8204 4600028D */ trunc.w.s $f10, $f0 -/* 02A88 80AB8208 8FA30018 */ lw $v1, 0x0018($sp) -/* 02A8C 80AB820C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 02A90 80AB8210 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 02A94 80AB8214 440F5000 */ mfc1 $t7, $f10 -/* 02A98 80AB8218 00000000 */ nop -/* 02A9C 80AB821C 25F80028 */ addiu $t8, $t7, 0x0028 ## $t8 = 00000028 -/* 02AA0 80AB8220 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 02AA4 80AB8224 A4780028 */ sh $t8, 0x0028($v1) ## 00000028 -/* 02AA8 80AB8228 4600040D */ trunc.w.s $f16, $f0 -/* 02AAC 80AB822C 8FA30018 */ lw $v1, 0x0018($sp) -/* 02AB0 80AB8230 44088000 */ mfc1 $t0, $f16 -/* 02AB4 80AB8234 10000004 */ beq $zero, $zero, .L80AB8248 -/* 02AB8 80AB8238 A468002A */ sh $t0, 0x002A($v1) ## 0000002A -.L80AB823C: -/* 02ABC 80AB823C 28410014 */ slti $at, $v0, 0x0014 -/* 02AC0 80AB8240 1420FFCD */ bne $at, $zero, .L80AB8178 -/* 02AC4 80AB8244 24630038 */ addiu $v1, $v1, 0x0038 ## $v1 = 00000038 -.L80AB8248: -/* 02AC8 80AB8248 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02ACC 80AB824C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02AD0 80AB8250 03E00008 */ jr $ra -/* 02AD4 80AB8254 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s deleted file mode 100644 index 436bf01399..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s +++ /dev/null @@ -1,128 +0,0 @@ -.late_rodata -glabel D_80AB8B10 - .float 0.2 - -glabel D_80AB8B14 - .float 3.14159274101 - -glabel D_80AB8B18 - .float 0.05 - -.text -glabel func_80AB8258 -/* 02AD8 80AB8258 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02ADC 80AB825C F7BE0038 */ sdc1 $f30, 0x0038($sp) -/* 02AE0 80AB8260 3C0180AC */ lui $at, %hi(D_80AB8B10) ## $at = 80AC0000 -/* 02AE4 80AB8264 C43E8B10 */ lwc1 $f30, %lo(D_80AB8B10)($at) -/* 02AE8 80AB8268 F7BC0030 */ sdc1 $f28, 0x0030($sp) -/* 02AEC 80AB826C 3C0180AC */ lui $at, %hi(D_80AB8B14) ## $at = 80AC0000 -/* 02AF0 80AB8270 C43C8B14 */ lwc1 $f28, %lo(D_80AB8B14)($at) -/* 02AF4 80AB8274 F7BA0028 */ sdc1 $f26, 0x0028($sp) -/* 02AF8 80AB8278 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 02AFC 80AB827C 4481D000 */ mtc1 $at, $f26 ## $f26 = -0.50 -/* 02B00 80AB8280 F7B80020 */ sdc1 $f24, 0x0020($sp) -/* 02B04 80AB8284 3C0180AC */ lui $at, %hi(D_80AB8B18) ## $at = 80AC0000 -/* 02B08 80AB8288 C4388B18 */ lwc1 $f24, %lo(D_80AB8B18)($at) -/* 02B0C 80AB828C F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 02B10 80AB8290 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 02B14 80AB8294 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02B18 80AB8298 AFB30050 */ sw $s3, 0x0050($sp) -/* 02B1C 80AB829C AFB2004C */ sw $s2, 0x004C($sp) -/* 02B20 80AB82A0 AFB10048 */ sw $s1, 0x0048($sp) -/* 02B24 80AB82A4 AFB00044 */ sw $s0, 0x0044($sp) -/* 02B28 80AB82A8 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 02B2C 80AB82AC 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 02B30 80AB82B0 AFBF0054 */ sw $ra, 0x0054($sp) -/* 02B34 80AB82B4 AFA5005C */ sw $a1, 0x005C($sp) -/* 02B38 80AB82B8 24900358 */ addiu $s0, $a0, 0x0358 ## $s0 = 00000358 -/* 02B3C 80AB82BC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 02B40 80AB82C0 24120001 */ addiu $s2, $zero, 0x0001 ## $s2 = 00000001 -/* 02B44 80AB82C4 24130BB8 */ addiu $s3, $zero, 0x0BB8 ## $s3 = 00000BB8 -.L80AB82C8: -/* 02B48 80AB82C8 920E0000 */ lbu $t6, 0x0000($s0) ## 00000358 -/* 02B4C 80AB82CC 51C0003D */ beql $t6, $zero, .L80AB83C4 -/* 02B50 80AB82D0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 02B54 80AB82D4 C6000010 */ lwc1 $f0, 0x0010($s0) ## 00000368 -/* 02B58 80AB82D8 C6040004 */ lwc1 $f4, 0x0004($s0) ## 0000035C -/* 02B5C 80AB82DC C6020014 */ lwc1 $f2, 0x0014($s0) ## 0000036C -/* 02B60 80AB82E0 C6080008 */ lwc1 $f8, 0x0008($s0) ## 00000360 -/* 02B64 80AB82E4 C60C0018 */ lwc1 $f12, 0x0018($s0) ## 00000370 -/* 02B68 80AB82E8 C610000C */ lwc1 $f16, 0x000C($s0) ## 00000364 -/* 02B6C 80AB82EC 46002180 */ add.s $f6, $f4, $f0 -/* 02B70 80AB82F0 C604001C */ lwc1 $f4, 0x001C($s0) ## 00000374 -/* 02B74 80AB82F4 920F0034 */ lbu $t7, 0x0034($s0) ## 0000038C -/* 02B78 80AB82F8 46024280 */ add.s $f10, $f8, $f2 -/* 02B7C 80AB82FC C6080020 */ lwc1 $f8, 0x0020($s0) ## 00000378 -/* 02B80 80AB8300 E6060004 */ swc1 $f6, 0x0004($s0) ## 0000035C -/* 02B84 80AB8304 460C8480 */ add.s $f18, $f16, $f12 -/* 02B88 80AB8308 C6100024 */ lwc1 $f16, 0x0024($s0) ## 0000037C -/* 02B8C 80AB830C E60A0008 */ swc1 $f10, 0x0008($s0) ## 00000360 -/* 02B90 80AB8310 46040180 */ add.s $f6, $f0, $f4 -/* 02B94 80AB8314 E612000C */ swc1 $f18, 0x000C($s0) ## 00000364 -/* 02B98 80AB8318 92190000 */ lbu $t9, 0x0000($s0) ## 00000358 -/* 02B9C 80AB831C 46081280 */ add.s $f10, $f2, $f8 -/* 02BA0 80AB8320 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 02BA4 80AB8324 A2180034 */ sb $t8, 0x0034($s0) ## 0000038C -/* 02BA8 80AB8328 46106480 */ add.s $f18, $f12, $f16 -/* 02BAC 80AB832C E6060010 */ swc1 $f6, 0x0010($s0) ## 00000368 -/* 02BB0 80AB8330 E60A0014 */ swc1 $f10, 0x0014($s0) ## 0000036C -/* 02BB4 80AB8334 16590022 */ bne $s2, $t9, .L80AB83C0 -/* 02BB8 80AB8338 E6120018 */ swc1 $f18, 0x0018($s0) ## 00000370 -/* 02BBC 80AB833C 8608002A */ lh $t0, 0x002A($s0) ## 00000382 -/* 02BC0 80AB8340 4405A000 */ mfc1 $a1, $f20 -/* 02BC4 80AB8344 4406B000 */ mfc1 $a2, $f22 -/* 02BC8 80AB8348 4407C000 */ mfc1 $a3, $f24 -/* 02BCC 80AB834C 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 02BD0 80AB8350 A609002A */ sh $t1, 0x002A($s0) ## 00000382 -/* 02BD4 80AB8354 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 02BD8 80AB8358 26040010 */ addiu $a0, $s0, 0x0010 ## $a0 = 00000368 -/* 02BDC 80AB835C 4405A000 */ mfc1 $a1, $f20 -/* 02BE0 80AB8360 4406B000 */ mfc1 $a2, $f22 -/* 02BE4 80AB8364 4407C000 */ mfc1 $a3, $f24 -/* 02BE8 80AB8368 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 02BEC 80AB836C 26040018 */ addiu $a0, $s0, 0x0018 ## $a0 = 00000370 -/* 02BF0 80AB8370 C6040014 */ lwc1 $f4, 0x0014($s0) ## 0000036C -/* 02BF4 80AB8374 461A203C */ c.lt.s $f4, $f26 -/* 02BF8 80AB8378 00000000 */ nop -/* 02BFC 80AB837C 45020003 */ bc1fl .L80AB838C -/* 02C00 80AB8380 860A002A */ lh $t2, 0x002A($s0) ## 00000382 -/* 02C04 80AB8384 E61A0014 */ swc1 $f26, 0x0014($s0) ## 0000036C -/* 02C08 80AB8388 860A002A */ lh $t2, 0x002A($s0) ## 00000382 -.L80AB838C: -/* 02C0C 80AB838C 01530019 */ multu $t2, $s3 -/* 02C10 80AB8390 00002012 */ mflo $a0 -/* 02C14 80AB8394 00042400 */ sll $a0, $a0, 16 -/* 02C18 80AB8398 0C01DE1C */ jal Math_Sins - ## sins? -/* 02C1C 80AB839C 00042403 */ sra $a0, $a0, 16 -/* 02C20 80AB83A0 461C0182 */ mul.s $f6, $f0, $f28 -/* 02C24 80AB83A4 860B0028 */ lh $t3, 0x0028($s0) ## 00000380 -/* 02C28 80AB83A8 920C0034 */ lbu $t4, 0x0034($s0) ## 0000038C -/* 02C2C 80AB83AC 016C082A */ slt $at, $t3, $t4 -/* 02C30 80AB83B0 461E3202 */ mul.s $f8, $f6, $f30 -/* 02C34 80AB83B4 10200002 */ beq $at, $zero, .L80AB83C0 -/* 02C38 80AB83B8 E6080030 */ swc1 $f8, 0x0030($s0) ## 00000388 -/* 02C3C 80AB83BC A2000000 */ sb $zero, 0x0000($s0) ## 00000358 -.L80AB83C0: -/* 02C40 80AB83C0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -.L80AB83C4: -/* 02C44 80AB83C4 00118C00 */ sll $s1, $s1, 16 -/* 02C48 80AB83C8 00118C03 */ sra $s1, $s1, 16 -/* 02C4C 80AB83CC 2A210014 */ slti $at, $s1, 0x0014 -/* 02C50 80AB83D0 1420FFBD */ bne $at, $zero, .L80AB82C8 -/* 02C54 80AB83D4 26100038 */ addiu $s0, $s0, 0x0038 ## $s0 = 00000390 -/* 02C58 80AB83D8 8FBF0054 */ lw $ra, 0x0054($sp) -/* 02C5C 80AB83DC D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 02C60 80AB83E0 D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 02C64 80AB83E4 D7B80020 */ ldc1 $f24, 0x0020($sp) -/* 02C68 80AB83E8 D7BA0028 */ ldc1 $f26, 0x0028($sp) -/* 02C6C 80AB83EC D7BC0030 */ ldc1 $f28, 0x0030($sp) -/* 02C70 80AB83F0 D7BE0038 */ ldc1 $f30, 0x0038($sp) -/* 02C74 80AB83F4 8FB00044 */ lw $s0, 0x0044($sp) -/* 02C78 80AB83F8 8FB10048 */ lw $s1, 0x0048($sp) -/* 02C7C 80AB83FC 8FB2004C */ lw $s2, 0x004C($sp) -/* 02C80 80AB8400 8FB30050 */ lw $s3, 0x0050($sp) -/* 02C84 80AB8404 03E00008 */ jr $ra -/* 02C88 80AB8408 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s deleted file mode 100644 index 5014306c00..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s +++ /dev/null @@ -1,135 +0,0 @@ -.rdata -glabel D_80AB8A20 - .asciz "../z_en_niw.c" - .balign 4 - -glabel D_80AB8A30 - .asciz "../z_en_niw.c" - .balign 4 - -glabel D_80AB8A40 - .asciz "../z_en_niw.c" - .balign 4 - -.text -glabel func_80AB840C -/* 02C8C 80AB840C 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 02C90 80AB8410 AFBF0054 */ sw $ra, 0x0054($sp) -/* 02C94 80AB8414 AFBE0050 */ sw $s8, 0x0050($sp) -/* 02C98 80AB8418 AFB7004C */ sw $s7, 0x004C($sp) -/* 02C9C 80AB841C AFB60048 */ sw $s6, 0x0048($sp) -/* 02CA0 80AB8420 AFB50044 */ sw $s5, 0x0044($sp) -/* 02CA4 80AB8424 AFB40040 */ sw $s4, 0x0040($sp) -/* 02CA8 80AB8428 AFB3003C */ sw $s3, 0x003C($sp) -/* 02CAC 80AB842C AFB20038 */ sw $s2, 0x0038($sp) -/* 02CB0 80AB8430 AFB10034 */ sw $s1, 0x0034($sp) -/* 02CB4 80AB8434 AFB00030 */ sw $s0, 0x0030($sp) -/* 02CB8 80AB8438 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 02CBC 80AB843C F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 02CC0 80AB8440 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 02CC4 80AB8444 8CB20000 */ lw $s2, 0x0000($a1) ## 00000000 -/* 02CC8 80AB8448 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 02CCC 80AB844C 24910358 */ addiu $s1, $a0, 0x0358 ## $s1 = 00000358 -/* 02CD0 80AB8450 3C0680AC */ lui $a2, %hi(D_80AB8A20) ## $a2 = 80AC0000 -/* 02CD4 80AB8454 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 02CD8 80AB8458 24C68A20 */ addiu $a2, $a2, %lo(D_80AB8A20) ## $a2 = 80AB8A20 -/* 02CDC 80AB845C 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC -/* 02CE0 80AB8460 24070769 */ addiu $a3, $zero, 0x0769 ## $a3 = 00000769 -/* 02CE4 80AB8464 0C031AB1 */ jal Graph_OpenDisps -/* 02CE8 80AB8468 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 02CEC 80AB846C 0C024F61 */ jal func_80093D84 -/* 02CF0 80AB8470 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 -/* 02CF4 80AB8474 3C01C47A */ lui $at, 0xC47A ## $at = C47A0000 -/* 02CF8 80AB8478 4481C000 */ mtc1 $at, $f24 ## $f24 = -1000.00 -/* 02CFC 80AB847C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02D00 80AB8480 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 02D04 80AB8484 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 02D08 80AB8488 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 02D0C 80AB848C 241E0001 */ addiu $s8, $zero, 0x0001 ## $s8 = 00000001 -/* 02D10 80AB8490 3C16DE00 */ lui $s6, 0xDE00 ## $s6 = DE000000 -.L80AB8494: -/* 02D14 80AB8494 922E0000 */ lbu $t6, 0x0000($s1) ## 00000358 -/* 02D18 80AB8498 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02D1C 80AB849C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02D20 80AB84A0 17CE0033 */ bne $s8, $t6, .L80AB8570 -/* 02D24 80AB84A4 02E18021 */ addu $s0, $s7, $at -/* 02D28 80AB84A8 3C150600 */ lui $s5, 0x0600 ## $s5 = 06000000 -/* 02D2C 80AB84AC 1680000A */ bne $s4, $zero, .L80AB84D8 -/* 02D30 80AB84B0 26B52428 */ addiu $s5, $s5, 0x2428 ## $s5 = 06002428 -/* 02D34 80AB84B4 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 02D38 80AB84B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02D3C 80AB84BC 248423B0 */ addiu $a0, $a0, 0x23B0 ## $a0 = 060023B0 -/* 02D40 80AB84C0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02D44 80AB84C4 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 02D48 80AB84C8 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 02D4C 80AB84CC 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 -/* 02D50 80AB84D0 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 -/* 02D54 80AB84D4 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -.L80AB84D8: -/* 02D58 80AB84D8 C62C0004 */ lwc1 $f12, 0x0004($s1) ## 0000035C -/* 02D5C 80AB84DC C62E0008 */ lwc1 $f14, 0x0008($s1) ## 00000360 -/* 02D60 80AB84E0 8E26000C */ lw $a2, 0x000C($s1) ## 00000364 -/* 02D64 80AB84E4 0C034261 */ jal Matrix_Translate -/* 02D68 80AB84E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02D6C 80AB84EC 0C0347F5 */ jal func_800D1FD4 -/* 02D70 80AB84F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D74 80AB84F4 C62C002C */ lwc1 $f12, 0x002C($s1) ## 00000384 -/* 02D78 80AB84F8 4406B000 */ mfc1 $a2, $f22 -/* 02D7C 80AB84FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02D80 80AB8500 0C0342A3 */ jal Matrix_Scale -/* 02D84 80AB8504 46006386 */ mov.s $f14, $f12 -/* 02D88 80AB8508 C62C0030 */ lwc1 $f12, 0x0030($s1) ## 00000388 -/* 02D8C 80AB850C 0C0343B5 */ jal Matrix_RotateZ -/* 02D90 80AB8510 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02D94 80AB8514 4406A000 */ mfc1 $a2, $f20 -/* 02D98 80AB8518 4600A306 */ mov.s $f12, $f20 -/* 02D9C 80AB851C 4600C386 */ mov.s $f14, $f24 -/* 02DA0 80AB8520 0C034261 */ jal Matrix_Translate -/* 02DA4 80AB8524 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02DA8 80AB8528 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 02DAC 80AB852C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 02DB0 80AB8530 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 02DB4 80AB8534 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02DB8 80AB8538 AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0 -/* 02DBC 80AB853C 3C0580AC */ lui $a1, %hi(D_80AB8A30) ## $a1 = 80AC0000 -/* 02DC0 80AB8540 24A58A30 */ addiu $a1, $a1, %lo(D_80AB8A30) ## $a1 = 80AB8A30 -/* 02DC4 80AB8544 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02DC8 80AB8548 24060779 */ addiu $a2, $zero, 0x0779 ## $a2 = 00000779 -/* 02DCC 80AB854C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02DD0 80AB8550 0C0346A2 */ jal Matrix_NewMtx -/* 02DD4 80AB8554 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 02DD8 80AB8558 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 02DDC 80AB855C 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 02DE0 80AB8560 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 02DE4 80AB8564 AE4802D0 */ sw $t0, 0x02D0($s2) ## 000002D0 -/* 02DE8 80AB8568 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 02DEC 80AB856C AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -.L80AB8570: -/* 02DF0 80AB8570 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 02DF4 80AB8574 00139C00 */ sll $s3, $s3, 16 -/* 02DF8 80AB8578 00139C03 */ sra $s3, $s3, 16 -/* 02DFC 80AB857C 2A610014 */ slti $at, $s3, 0x0014 -/* 02E00 80AB8580 1420FFC4 */ bne $at, $zero, .L80AB8494 -/* 02E04 80AB8584 26310038 */ addiu $s1, $s1, 0x0038 ## $s1 = 00000390 -/* 02E08 80AB8588 3C0680AC */ lui $a2, %hi(D_80AB8A40) ## $a2 = 80AC0000 -/* 02E0C 80AB858C 24C68A40 */ addiu $a2, $a2, %lo(D_80AB8A40) ## $a2 = 80AB8A40 -/* 02E10 80AB8590 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC -/* 02E14 80AB8594 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 02E18 80AB8598 0C031AD5 */ jal Graph_CloseDisps -/* 02E1C 80AB859C 2407077F */ addiu $a3, $zero, 0x077F ## $a3 = 0000077F -/* 02E20 80AB85A0 8FBF0054 */ lw $ra, 0x0054($sp) -/* 02E24 80AB85A4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 02E28 80AB85A8 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 02E2C 80AB85AC D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 02E30 80AB85B0 8FB00030 */ lw $s0, 0x0030($sp) -/* 02E34 80AB85B4 8FB10034 */ lw $s1, 0x0034($sp) -/* 02E38 80AB85B8 8FB20038 */ lw $s2, 0x0038($sp) -/* 02E3C 80AB85BC 8FB3003C */ lw $s3, 0x003C($sp) -/* 02E40 80AB85C0 8FB40040 */ lw $s4, 0x0040($sp) -/* 02E44 80AB85C4 8FB50044 */ lw $s5, 0x0044($sp) -/* 02E48 80AB85C8 8FB60048 */ lw $s6, 0x0048($sp) -/* 02E4C 80AB85CC 8FB7004C */ lw $s7, 0x004C($sp) -/* 02E50 80AB85D0 8FBE0050 */ lw $s8, 0x0050($sp) -/* 02E54 80AB85D4 03E00008 */ jr $ra -/* 02E58 80AB85D8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 02E5C 80AB85DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s index 361145987d..ce0f327178 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s @@ -65,7 +65,7 @@ glabel func_80B59828 /* 06550 80B59900 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 /* 06554 80B59904 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 06558 80B59908 A42AFA84 */ sh $t2, %lo(gSaveContext+0x1424)($at) -/* 0655C 80B5990C 0C021DA0 */ jal func_80087680 +/* 0655C 80B5990C 0C021DA0 */ jal Magic_Fill /* 06560 80B59910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06564 80B59914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06568 80B59918 0C00B2D0 */ jal Flags_GetSwitch diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s index d8dcd01fe2..44b9b8071a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s @@ -28,7 +28,7 @@ glabel func_80B59AD0 /* 06784 80B59B34 24180140 */ addiu $t8, $zero, 0x0140 ## $t8 = 00000140 /* 06788 80B59B38 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 0678C 80B59B3C A438FA84 */ sh $t8, %lo(gSaveContext+0x1424)($at) -/* 06790 80B59B40 0C021DA0 */ jal func_80087680 +/* 06790 80B59B40 0C021DA0 */ jal Magic_Fill /* 06794 80B59B44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06798 80B59B48 2419001B */ addiu $t9, $zero, 0x001B ## $t9 = 0000001B /* 0679C 80B59B4C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s deleted file mode 100644 index f8b6cdf108..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel ObjOshihiki_Destroy -/* 00718 80B9B898 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0071C 80B9B89C AFA40018 */ sw $a0, 0x0018($sp) -/* 00720 80B9B8A0 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00724 80B9B8A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00728 80B9B8A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0072C 80B9B8AC 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00730 80B9B8B0 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00734 80B9B8B4 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00738 80B9B8B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0073C 80B9B8BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00740 80B9B8C0 03E00008 */ jr $ra -/* 00744 80B9B8C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s deleted file mode 100644 index 295e85944b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s +++ /dev/null @@ -1,178 +0,0 @@ -.rdata -glabel D_80B9CC5C - .asciz "../z_obj_oshihiki.c" - .balign 4 - -glabel D_80B9CC70 - .asciz "../z_obj_oshihiki.c" - .balign 4 - -glabel D_80B9CC84 - .asciz "../z_obj_oshihiki.c" - .balign 4 - -.late_rodata -glabel jtbl_80B9CD1C - .word L80B9C8B8 - .word L80B9C8B8 - .word L80B9C8F8 - .word L80B9C8B8 - .word L80B9C8B8 - .word L80B9C8B8 - .word L80B9C8B8 - .word L80B9C8B8 - .word L80B9C8F8 - .word L80B9C8F8 - .word L80B9C8F8 - .word L80B9C8B8 - -.text -glabel ObjOshihiki_Draw -/* 015E4 80B9C764 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 015E8 80B9C768 AFBF001C */ sw $ra, 0x001C($sp) -/* 015EC 80B9C76C AFB00018 */ sw $s0, 0x0018($sp) -/* 015F0 80B9C770 AFA5005C */ sw $a1, 0x005C($sp) -/* 015F4 80B9C774 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 015F8 80B9C778 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015FC 80B9C77C 3C0680BA */ lui $a2, %hi(D_80B9CC5C) ## $a2 = 80BA0000 -/* 01600 80B9C780 24C6CC5C */ addiu $a2, $a2, %lo(D_80B9CC5C) ## $a2 = 80B9CC5C -/* 01604 80B9C784 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 01608 80B9C788 24070509 */ addiu $a3, $zero, 0x0509 ## $a3 = 00000509 -/* 0160C 80B9C78C 0C031AB1 */ jal Graph_OpenDisps -/* 01610 80B9C790 AFA5004C */ sw $a1, 0x004C($sp) -/* 01614 80B9C794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01618 80B9C798 0C2E6FC2 */ jal func_80B9BF08 -/* 0161C 80B9C79C 8FA5005C */ lw $a1, 0x005C($sp) -/* 01620 80B9C7A0 1040000E */ beq $v0, $zero, .L80B9C7DC -/* 01624 80B9C7A4 8FA8004C */ lw $t0, 0x004C($sp) -/* 01628 80B9C7A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0162C 80B9C7AC 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 01630 80B9C7B0 C60401C4 */ lwc1 $f4, 0x01C4($s0) ## 000001C4 -/* 01634 80B9C7B4 C60601C8 */ lwc1 $f6, 0x01C8($s0) ## 000001C8 -/* 01638 80B9C7B8 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 0163C 80B9C7BC 46002302 */ mul.s $f12, $f4, $f0 -/* 01640 80B9C7C0 AFA8004C */ sw $t0, 0x004C($sp) -/* 01644 80B9C7C4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01648 80B9C7C8 46003202 */ mul.s $f8, $f6, $f0 -/* 0164C 80B9C7CC 44064000 */ mfc1 $a2, $f8 -/* 01650 80B9C7D0 0C034261 */ jal Matrix_Translate -/* 01654 80B9C7D4 00000000 */ nop -/* 01658 80B9C7D8 8FA8004C */ lw $t0, 0x004C($sp) -.L80B9C7DC: -/* 0165C 80B9C7DC 960F0168 */ lhu $t7, 0x0168($s0) ## 00000168 -/* 01660 80B9C7E0 31F8FEFF */ andi $t8, $t7, 0xFEFF ## $t8 = 00000000 -/* 01664 80B9C7E4 A6180168 */ sh $t8, 0x0168($s0) ## 00000168 -/* 01668 80B9C7E8 8FB9005C */ lw $t9, 0x005C($sp) -/* 0166C 80B9C7EC 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 01670 80B9C7F0 0C024F46 */ jal func_80093D18 -/* 01674 80B9C7F4 AFA8004C */ sw $t0, 0x004C($sp) -/* 01678 80B9C7F8 8FA8004C */ lw $t0, 0x004C($sp) -/* 0167C 80B9C7FC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 01680 80B9C800 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 01684 80B9C804 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01688 80B9C808 3C0E8016 */ lui $t6, %hi(gSegments) -/* 0168C 80B9C80C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01690 80B9C810 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01694 80B9C814 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 01698 80B9C818 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0169C 80B9C81C 8E0401CC */ lw $a0, 0x01CC($s0) ## 000001CC -/* 016A0 80B9C820 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 016A4 80B9C824 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 016A8 80B9C828 00045900 */ sll $t3, $a0, 4 -/* 016AC 80B9C82C 000B6702 */ srl $t4, $t3, 28 -/* 016B0 80B9C830 000C6880 */ sll $t5, $t4, 2 -/* 016B4 80B9C834 01CD7021 */ addu $t6, $t6, $t5 -/* 016B8 80B9C838 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 016BC 80B9C83C 00817824 */ and $t7, $a0, $at -/* 016C0 80B9C840 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 016C4 80B9C844 01CFC021 */ addu $t8, $t6, $t7 -/* 016C8 80B9C848 0301C821 */ addu $t9, $t8, $at -/* 016CC 80B9C84C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 016D0 80B9C850 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 016D4 80B9C854 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 016D8 80B9C858 3C0580BA */ lui $a1, %hi(D_80B9CC70) ## $a1 = 80BA0000 -/* 016DC 80B9C85C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 016E0 80B9C860 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 016E4 80B9C864 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 016E8 80B9C868 8FAB005C */ lw $t3, 0x005C($sp) -/* 016EC 80B9C86C 24A5CC70 */ addiu $a1, $a1, %lo(D_80B9CC70) ## $a1 = 80B9CC70 -/* 016F0 80B9C870 2406051C */ addiu $a2, $zero, 0x051C ## $a2 = 0000051C -/* 016F4 80B9C874 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 016F8 80B9C878 AFA8004C */ sw $t0, 0x004C($sp) -/* 016FC 80B9C87C 0C0346A2 */ jal Matrix_NewMtx -/* 01700 80B9C880 AFA20034 */ sw $v0, 0x0034($sp) -/* 01704 80B9C884 8FA30034 */ lw $v1, 0x0034($sp) -/* 01708 80B9C888 8FA8004C */ lw $t0, 0x004C($sp) -/* 0170C 80B9C88C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01710 80B9C890 8FAC005C */ lw $t4, 0x005C($sp) -/* 01714 80B9C894 958D00A4 */ lhu $t5, 0x00A4($t4) ## 000000A4 -/* 01718 80B9C898 2DA1000C */ sltiu $at, $t5, 0x000C -/* 0171C 80B9C89C 10200016 */ beq $at, $zero, .L80B9C8F8 -/* 01720 80B9C8A0 000D6880 */ sll $t5, $t5, 2 -/* 01724 80B9C8A4 3C0180BA */ lui $at, %hi(jtbl_80B9CD1C) ## $at = 80BA0000 -/* 01728 80B9C8A8 002D0821 */ addu $at, $at, $t5 -/* 0172C 80B9C8AC 8C2DCD1C */ lw $t5, %lo(jtbl_80B9CD1C)($at) -/* 01730 80B9C8B0 01A00008 */ jr $t5 -/* 01734 80B9C8B4 00000000 */ nop -glabel L80B9C8B8 -/* 01738 80B9C8B8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0173C 80B9C8BC 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 01740 80B9C8C0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01744 80B9C8C4 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 01748 80B9C8C8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0174C 80B9C8CC 920B01D1 */ lbu $t3, 0x01D1($s0) ## 000001D1 -/* 01750 80B9C8D0 921901D0 */ lbu $t9, 0x01D0($s0) ## 000001D0 -/* 01754 80B9C8D4 920F01D2 */ lbu $t7, 0x01D2($s0) ## 000001D2 -/* 01758 80B9C8D8 000B6400 */ sll $t4, $t3, 16 -/* 0175C 80B9C8DC 00194E00 */ sll $t1, $t9, 24 -/* 01760 80B9C8E0 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 -/* 01764 80B9C8E4 000FC200 */ sll $t8, $t7, 8 -/* 01768 80B9C8E8 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000000 -/* 0176C 80B9C8EC 372A00FF */ ori $t2, $t9, 0x00FF ## $t2 = 000000FF -/* 01770 80B9C8F0 10000014 */ beq $zero, $zero, .L80B9C944 -/* 01774 80B9C8F4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -glabel L80B9C8F8 -.L80B9C8F8: -/* 01778 80B9C8F8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0177C 80B9C8FC 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 01780 80B9C900 3C038016 */ lui $v1, %hi(gGameInfo) -/* 01784 80B9C904 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01788 80B9C908 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 0178C 80B9C90C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01790 80B9C910 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 01794 80B9C914 846C1172 */ lh $t4, 0x1172($v1) ## 80161172 -/* 01798 80B9C918 8478116E */ lh $t8, 0x116E($v1) ## 8016116E -/* 0179C 80B9C91C 846B1170 */ lh $t3, 0x1170($v1) ## 80161170 -/* 017A0 80B9C920 318E00FF */ andi $t6, $t4, 0x00FF ## $t6 = 00000000 -/* 017A4 80B9C924 000E7A00 */ sll $t7, $t6, 8 -/* 017A8 80B9C928 0018CE00 */ sll $t9, $t8, 24 -/* 017AC 80B9C92C 316900FF */ andi $t1, $t3, 0x00FF ## $t1 = 00000008 -/* 017B0 80B9C930 00096400 */ sll $t4, $t1, 16 -/* 017B4 80B9C934 01F95025 */ or $t2, $t7, $t9 ## $t2 = FB000000 -/* 017B8 80B9C938 014C7025 */ or $t6, $t2, $t4 ## $t6 = FB000000 -/* 017BC 80B9C93C 35CD00FF */ ori $t5, $t6, 0x00FF ## $t5 = FB0000FF -/* 017C0 80B9C940 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L80B9C944: -/* 017C4 80B9C944 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 017C8 80B9C948 3C190500 */ lui $t9, 0x0500 ## $t9 = 05000000 -/* 017CC 80B9C94C 27394CD0 */ addiu $t9, $t9, 0x4CD0 ## $t9 = 05004CD0 -/* 017D0 80B9C950 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 017D4 80B9C954 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 017D8 80B9C958 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 017DC 80B9C95C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 017E0 80B9C960 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 017E4 80B9C964 8FAB005C */ lw $t3, 0x005C($sp) -/* 017E8 80B9C968 3C0680BA */ lui $a2, %hi(D_80B9CC84) ## $a2 = 80BA0000 -/* 017EC 80B9C96C 24C6CC84 */ addiu $a2, $a2, %lo(D_80B9CC84) ## $a2 = 80B9CC84 -/* 017F0 80B9C970 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 017F4 80B9C974 24070536 */ addiu $a3, $zero, 0x0536 ## $a3 = 00000536 -/* 017F8 80B9C978 0C031AD5 */ jal Graph_CloseDisps -/* 017FC 80B9C97C 8D650000 */ lw $a1, 0x0000($t3) ## 00000008 -/* 01800 80B9C980 8FBF001C */ lw $ra, 0x001C($sp) -/* 01804 80B9C984 8FB00018 */ lw $s0, 0x0018($sp) -/* 01808 80B9C988 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 0180C 80B9C98C 03E00008 */ jr $ra -/* 01810 80B9C990 00000000 */ nop -/* 01814 80B9C994 00000000 */ nop -/* 01818 80B9C998 00000000 */ nop -/* 0181C 80B9C99C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s deleted file mode 100644 index 637a6b26ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s +++ /dev/null @@ -1,94 +0,0 @@ -.rdata -glabel D_80B9CBD4 - .asciz "(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n" - .balign 4 - -.text -glabel ObjOshihiki_Init -/* 005E8 80B9B768 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005EC 80B9B76C AFBF001C */ sw $ra, 0x001C($sp) -/* 005F0 80B9B770 AFB00018 */ sw $s0, 0x0018($sp) -/* 005F4 80B9B774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005F8 80B9B778 0C2E6D61 */ jal func_80B9B584 -/* 005FC 80B9B77C AFA50024 */ sw $a1, 0x0024($sp) -/* 00600 80B9B780 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00604 80B9B784 00021203 */ sra $v0, $v0, 8 -/* 00608 80B9B788 304300FF */ andi $v1, $v0, 0x00FF ## $v1 = 00000000 -/* 0060C 80B9B78C 04600025 */ bltz $v1, .L80B9B824 -/* 00610 80B9B790 28610040 */ slti $at, $v1, 0x0040 -/* 00614 80B9B794 10200023 */ beq $at, $zero, .L80B9B824 -/* 00618 80B9B798 8FA40024 */ lw $a0, 0x0024($sp) -/* 0061C 80B9B79C 0C00B2D0 */ jal Flags_GetSwitch - -/* 00620 80B9B7A0 3045003F */ andi $a1, $v0, 0x003F ## $a1 = 00000000 -/* 00624 80B9B7A4 50400011 */ beql $v0, $zero, .L80B9B7EC -/* 00628 80B9B7A8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 0062C 80B9B7AC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00630 80B9B7B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00634 80B9B7B4 3042000F */ andi $v0, $v0, 0x000F ## $v0 = 00000000 -/* 00638 80B9B7B8 10400007 */ beq $v0, $zero, .L80B9B7D8 -/* 0063C 80B9B7BC 00000000 */ nop -/* 00640 80B9B7C0 10410005 */ beq $v0, $at, .L80B9B7D8 -/* 00644 80B9B7C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00648 80B9B7C8 10410003 */ beq $v0, $at, .L80B9B7D8 -/* 0064C 80B9B7CC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00650 80B9B7D0 54410015 */ bnel $v0, $at, .L80B9B828 -/* 00654 80B9B7D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9B7D8: -/* 00658 80B9B7D8 0C00B55C */ jal Actor_Kill - -/* 0065C 80B9B7DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00660 80B9B7E0 10000029 */ beq $zero, $zero, .L80B9B888 -/* 00664 80B9B7E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00668 80B9B7E8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80B9B7EC: -/* 0066C 80B9B7EC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00670 80B9B7F0 3042000F */ andi $v0, $v0, 0x000F ## $v0 = 00000000 -/* 00674 80B9B7F4 10410007 */ beq $v0, $at, .L80B9B814 -/* 00678 80B9B7F8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0067C 80B9B7FC 10410005 */ beq $v0, $at, .L80B9B814 -/* 00680 80B9B800 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00684 80B9B804 10410003 */ beq $v0, $at, .L80B9B814 -/* 00688 80B9B808 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0068C 80B9B80C 54410006 */ bnel $v0, $at, .L80B9B828 -/* 00690 80B9B810 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9B814: -/* 00694 80B9B814 0C00B55C */ jal Actor_Kill - -/* 00698 80B9B818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0069C 80B9B81C 1000001A */ beq $zero, $zero, .L80B9B888 -/* 006A0 80B9B820 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9B824: -/* 006A4 80B9B824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9B828: -/* 006A8 80B9B828 0C2E6D7D */ jal func_80B9B5F4 -/* 006AC 80B9B82C 8FA50024 */ lw $a1, 0x0024($sp) -/* 006B0 80B9B830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006B4 80B9B834 0C2E6D8B */ jal func_80B9B62C -/* 006B8 80B9B838 8FA50024 */ lw $a1, 0x0024($sp) -/* 006BC 80B9B83C 3C0580BA */ lui $a1, %hi(D_80B9CA60) ## $a1 = 80BA0000 -/* 006C0 80B9B840 24A5CA60 */ addiu $a1, $a1, %lo(D_80B9CA60) ## $a1 = 80B9CA60 -/* 006C4 80B9B844 0C01E037 */ jal Actor_ProcessInitChain - -/* 006C8 80B9B848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006CC 80B9B84C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 006D0 80B9B850 A20E00AE */ sb $t6, 0x00AE($s0) ## 000000AE -/* 006D4 80B9B854 8FA50024 */ lw $a1, 0x0024($sp) -/* 006D8 80B9B858 0C2E6DA3 */ jal func_80B9B68C -/* 006DC 80B9B85C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006E0 80B9B860 0C2E6CB6 */ jal func_80B9B2D8 -/* 006E4 80B9B864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006E8 80B9B868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006EC 80B9B86C 0C2E7044 */ jal func_80B9C110 -/* 006F0 80B9B870 8FA50024 */ lw $a1, 0x0024($sp) -/* 006F4 80B9B874 3C0480BA */ lui $a0, %hi(D_80B9CBD4) ## $a0 = 80BA0000 -/* 006F8 80B9B878 2484CBD4 */ addiu $a0, $a0, %lo(D_80B9CBD4) ## $a0 = 80B9CBD4 -/* 006FC 80B9B87C 0C00084C */ jal osSyncPrintf - -/* 00700 80B9B880 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00704 80B9B884 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9B888: -/* 00708 80B9B888 8FB00018 */ lw $s0, 0x0018($sp) -/* 0070C 80B9B88C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00710 80B9B890 03E00008 */ jr $ra -/* 00714 80B9B894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s deleted file mode 100644 index ae716e38ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel ObjOshihiki_Update -/* 0155C 80B9C6DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01560 80B9C6E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01564 80B9C6E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01568 80B9C6E8 948E0168 */ lhu $t6, 0x0168($a0) ## 00000168 -/* 0156C 80B9C6EC 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -/* 01570 80B9C6F0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01574 80B9C6F4 31D8FF00 */ andi $t8, $t6, 0xFF00 ## $t8 = 00000000 -/* 01578 80B9C6F8 A4980168 */ sh $t8, 0x0168($a0) ## 00000168 -/* 0157C 80B9C6FC 37190100 */ ori $t9, $t8, 0x0100 ## $t9 = 00000100 -/* 01580 80B9C700 18400003 */ blez $v0, .L80B9C710 -/* 01584 80B9C704 A4990168 */ sh $t9, 0x0168($a0) ## 00000168 -/* 01588 80B9C708 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 0158C 80B9C70C A488016A */ sh $t0, 0x016A($a0) ## 0000016A -.L80B9C710: -/* 01590 80B9C710 84C90158 */ lh $t1, 0x0158($a2) ## 00000158 -/* 01594 80B9C714 A4C90032 */ sh $t1, 0x0032($a2) ## 00000032 -/* 01598 80B9C718 84C40032 */ lh $a0, 0x0032($a2) ## 00000032 -/* 0159C 80B9C71C 0C01DE1C */ jal Math_Sins - ## sins? -/* 015A0 80B9C720 AFA60018 */ sw $a2, 0x0018($sp) -/* 015A4 80B9C724 8FA60018 */ lw $a2, 0x0018($sp) -/* 015A8 80B9C728 E4C0016C */ swc1 $f0, 0x016C($a2) ## 0000016C -/* 015AC 80B9C72C 0C01DE0D */ jal Math_Coss - ## coss? -/* 015B0 80B9C730 84C40032 */ lh $a0, 0x0032($a2) ## 00000032 -/* 015B4 80B9C734 8FA60018 */ lw $a2, 0x0018($sp) -/* 015B8 80B9C738 8CC20164 */ lw $v0, 0x0164($a2) ## 00000164 -/* 015BC 80B9C73C E4C00170 */ swc1 $f0, 0x0170($a2) ## 00000170 -/* 015C0 80B9C740 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 015C4 80B9C744 50400004 */ beql $v0, $zero, .L80B9C758 -/* 015C8 80B9C748 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015CC 80B9C74C 0040F809 */ jalr $ra, $v0 -/* 015D0 80B9C750 8FA5001C */ lw $a1, 0x001C($sp) -/* 015D4 80B9C754 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9C758: -/* 015D8 80B9C758 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015DC 80B9C75C 03E00008 */ jr $ra -/* 015E0 80B9C760 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s deleted file mode 100644 index 8338515292..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s +++ /dev/null @@ -1,50 +0,0 @@ -.rdata -glabel D_80B9CAF0 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B9CB30 - .asciz "../z_obj_oshihiki.c" - .balign 4 - -.text -glabel func_80B9B180 -/* 00000 80B9B180 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80B9B184 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 80B9B188 AFB00020 */ sw $s0, 0x0020($sp) -/* 0000C 80B9B18C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 80B9B190 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 80B9B194 AFA60040 */ sw $a2, 0x0040($sp) -/* 00018 80B9B198 AFA00030 */ sw $zero, 0x0030($sp) -/* 0001C 80B9B19C 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00020 80B9B1A0 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00024 80B9B1A4 8FA40040 */ lw $a0, 0x0040($sp) -/* 00028 80B9B1A8 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0002C 80B9B1AC 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00030 80B9B1B0 8FA4003C */ lw $a0, 0x003C($sp) -/* 00034 80B9B1B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00038 80B9B1B8 8FA70030 */ lw $a3, 0x0030($sp) -/* 0003C 80B9B1BC 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00040 80B9B1C0 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00044 80B9B1C4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00048 80B9B1C8 1441000A */ bne $v0, $at, .L80B9B1F4 -/* 0004C 80B9B1CC AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00050 80B9B1D0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00054 80B9B1D4 3C0480BA */ lui $a0, %hi(D_80B9CAF0) ## $a0 = 80BA0000 -/* 00058 80B9B1D8 3C0580BA */ lui $a1, %hi(D_80B9CB30) ## $a1 = 80BA0000 -/* 0005C 80B9B1DC 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00060 80B9B1E0 24A5CB30 */ addiu $a1, $a1, %lo(D_80B9CB30) ## $a1 = 80B9CB30 -/* 00064 80B9B1E4 2484CAF0 */ addiu $a0, $a0, %lo(D_80B9CAF0) ## $a0 = 80B9CAF0 -/* 00068 80B9B1E8 24060118 */ addiu $a2, $zero, 0x0118 ## $a2 = 00000118 -/* 0006C 80B9B1EC 0C00084C */ jal osSyncPrintf - -/* 00070 80B9B1F0 AFAE0010 */ sw $t6, 0x0010($sp) -.L80B9B1F4: -/* 00074 80B9B1F4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00078 80B9B1F8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0007C 80B9B1FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00080 80B9B200 03E00008 */ jr $ra -/* 00084 80B9B204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s deleted file mode 100644 index 7592dd4b83..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B9B208 -/* 00088 80B9B208 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 0008C 80B9B20C C4A40008 */ lwc1 $f4, 0x0008($a1) ## 00000008 -/* 00090 80B9B210 44877000 */ mtc1 $a3, $f14 ## $f14 = 0.00 -/* 00094 80B9B214 C4A80000 */ lwc1 $f8, 0x0000($a1) ## 00000000 -/* 00098 80B9B218 460C2182 */ mul.s $f6, $f4, $f12 -/* 0009C 80B9B21C 00000000 */ nop -/* 000A0 80B9B220 460E4282 */ mul.s $f10, $f8, $f14 -/* 000A4 80B9B224 460A3400 */ add.s $f16, $f6, $f10 -/* 000A8 80B9B228 E4900000 */ swc1 $f16, 0x0000($a0) ## 00000000 -/* 000AC 80B9B22C C4B20004 */ lwc1 $f18, 0x0004($a1) ## 00000004 -/* 000B0 80B9B230 E4920004 */ swc1 $f18, 0x0004($a0) ## 00000004 -/* 000B4 80B9B234 C4A40008 */ lwc1 $f4, 0x0008($a1) ## 00000008 -/* 000B8 80B9B238 C4A60000 */ lwc1 $f6, 0x0000($a1) ## 00000000 -/* 000BC 80B9B23C 460E2202 */ mul.s $f8, $f4, $f14 -/* 000C0 80B9B240 00000000 */ nop -/* 000C4 80B9B244 460C3282 */ mul.s $f10, $f6, $f12 -/* 000C8 80B9B248 460A4401 */ sub.s $f16, $f8, $f10 -/* 000CC 80B9B24C 03E00008 */ jr $ra -/* 000D0 80B9B250 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s deleted file mode 100644 index a7dc4af9ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s +++ /dev/null @@ -1,51 +0,0 @@ -.late_rodata -glabel jtbl_80B9CC98 - .word L80B9B2AC - .word L80B9B2AC - .word L80B9B2B4 - .word L80B9B2BC - .word L80B9B2AC - .word L80B9B2AC - .word L80B9B2B4 - .word L80B9B2BC - -.text -glabel func_80B9B254 -/* 000D4 80B9B254 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000D8 80B9B258 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000DC 80B9B25C 908E01BE */ lbu $t6, 0x01BE($a0) ## 000001BE -/* 000E0 80B9B260 11C00003 */ beq $t6, $zero, .L80B9B270 -/* 000E4 80B9B264 00000000 */ nop -/* 000E8 80B9B268 10000017 */ beq $zero, $zero, .L80B9B2C8 -/* 000EC 80B9B26C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B9B270: -/* 000F0 80B9B270 0C023C0D */ jal Player_GetStrength -/* 000F4 80B9B274 AFA40018 */ sw $a0, 0x0018($sp) -/* 000F8 80B9B278 8FA40018 */ lw $a0, 0x0018($sp) -/* 000FC 80B9B27C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 00100 80B9B280 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00104 80B9B284 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 00108 80B9B288 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 0010C 80B9B28C 2F010008 */ sltiu $at, $t8, 0x0008 -/* 00110 80B9B290 1020000D */ beq $at, $zero, .L80B9B2C8 -/* 00114 80B9B294 0018C080 */ sll $t8, $t8, 2 -/* 00118 80B9B298 3C0180BA */ lui $at, %hi(jtbl_80B9CC98) ## $at = 80BA0000 -/* 0011C 80B9B29C 00380821 */ addu $at, $at, $t8 -/* 00120 80B9B2A0 8C38CC98 */ lw $t8, %lo(jtbl_80B9CC98)($at) -/* 00124 80B9B2A4 03000008 */ jr $t8 -/* 00128 80B9B2A8 00000000 */ nop -glabel L80B9B2AC -/* 0012C 80B9B2AC 10000006 */ beq $zero, $zero, .L80B9B2C8 -/* 00130 80B9B2B0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -glabel L80B9B2B4 -/* 00134 80B9B2B4 10000004 */ beq $zero, $zero, .L80B9B2C8 -/* 00138 80B9B2B8 0003102A */ slt $v0, $zero, $v1 -glabel L80B9B2BC -/* 0013C 80B9B2BC 28620002 */ slti $v0, $v1, 0x0002 -/* 00140 80B9B2C0 10000001 */ beq $zero, $zero, .L80B9B2C8 -/* 00144 80B9B2C4 38420001 */ xori $v0, $v0, 0x0001 ## $v0 = 00000000 -.L80B9B2C8: -/* 00148 80B9B2C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0014C 80B9B2CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00150 80B9B2D0 03E00008 */ jr $ra -/* 00154 80B9B2D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s deleted file mode 100644 index 3b32913993..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B9B2D8 -/* 00158 80B9B2D8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0015C 80B9B2DC 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 00160 80B9B2E0 00027080 */ sll $t6, $v0, 2 -/* 00164 80B9B2E4 AC850180 */ sw $a1, 0x0180($a0) ## 00000180 -/* 00168 80B9B2E8 008E1821 */ addu $v1, $a0, $t6 -/* 0016C 80B9B2EC AC650184 */ sw $a1, 0x0184($v1) ## 00000184 -/* 00170 80B9B2F0 AC650188 */ sw $a1, 0x0188($v1) ## 00000188 -/* 00174 80B9B2F4 AC65018C */ sw $a1, 0x018C($v1) ## 0000018C -/* 00178 80B9B2F8 03E00008 */ jr $ra -/* 0017C 80B9B2FC AC650180 */ sw $a1, 0x0180($v1) ## 00000180 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s deleted file mode 100644 index 52a8c01614..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s +++ /dev/null @@ -1,44 +0,0 @@ -.late_rodata -glabel D_80B9CCB8 - .float 0.001 - -.text -glabel func_80B9B300 -/* 00180 80B9B300 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00184 80B9B304 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00188 80B9B308 848E01BC */ lh $t6, 0x01BC($a0) ## 000001BC -/* 0018C 80B9B30C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00190 80B9B310 000E7880 */ sll $t7, $t6, 2 -/* 00194 80B9B314 008FC021 */ addu $t8, $a0, $t7 -/* 00198 80B9B318 8F060180 */ lw $a2, 0x0180($t8) ## 00000180 -/* 0019C 80B9B31C 50C10017 */ beql $a2, $at, .L80B9B37C -/* 001A0 80B9B320 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001A4 80B9B324 C4840080 */ lwc1 $f4, 0x0080($a0) ## 00000080 -/* 001A8 80B9B328 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 001AC 80B9B32C 3C0180BA */ lui $at, %hi(D_80B9CCB8) ## $at = 80BA0000 -/* 001B0 80B9B330 C428CCB8 */ lwc1 $f8, %lo(D_80B9CCB8)($at) -/* 001B4 80B9B334 46062001 */ sub.s $f0, $f4, $f6 -/* 001B8 80B9B338 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 001BC 80B9B33C 46000005 */ abs.s $f0, $f0 -/* 001C0 80B9B340 4608003C */ c.lt.s $f0, $f8 -/* 001C4 80B9B344 00000000 */ nop -/* 001C8 80B9B348 4502000C */ bc1fl .L80B9B37C -/* 001CC 80B9B34C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001D0 80B9B350 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 001D4 80B9B354 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 001D8 80B9B358 50400008 */ beql $v0, $zero, .L80B9B37C -/* 001DC 80B9B35C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001E0 80B9B360 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 001E4 80B9B364 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 001E8 80B9B368 57210004 */ bnel $t9, $at, .L80B9B37C -/* 001EC 80B9B36C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001F0 80B9B370 10000003 */ beq $zero, $zero, .L80B9B380 -/* 001F4 80B9B374 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001F8 80B9B378 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B9B37C: -/* 001FC 80B9B37C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9B380: -/* 00200 80B9B380 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00204 80B9B384 03E00008 */ jr $ra -/* 00208 80B9B388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s deleted file mode 100644 index 82b8298659..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80B9B38C -/* 0020C 80B9B38C C4800008 */ lwc1 $f0, 0x0008($a0) ## 00000008 -/* 00210 80B9B390 C4820024 */ lwc1 $f2, 0x0024($a0) ## 00000024 -/* 00214 80B9B394 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00218 80B9B398 4602003C */ c.lt.s $f0, $f2 -/* 0021C 80B9B39C 00000000 */ nop -/* 00220 80B9B3A0 45020014 */ bc1fl .L80B9B3F4 -/* 00224 80B9B3A4 46020281 */ sub.s $f10, $f0, $f2 -/* 00228 80B9B3A8 46001101 */ sub.s $f4, $f2, $f0 -/* 0022C 80B9B3AC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00230 80B9B3B0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00234 80B9B3B4 00000000 */ nop -/* 00238 80B9B3B8 4604603E */ c.le.s $f12, $f4 -/* 0023C 80B9B3BC 00000000 */ nop -/* 00240 80B9B3C0 4502001B */ bc1fl .L80B9B430 -/* 00244 80B9B3C4 C4800010 */ lwc1 $f0, 0x0010($a0) ## 00000010 -/* 00248 80B9B3C8 460C0180 */ add.s $f6, $f0, $f12 -.L80B9B3CC: -/* 0024C 80B9B3CC E4860008 */ swc1 $f6, 0x0008($a0) ## 00000008 -/* 00250 80B9B3D0 C4800008 */ lwc1 $f0, 0x0008($a0) ## 00000008 -/* 00254 80B9B3D4 46001201 */ sub.s $f8, $f2, $f0 -/* 00258 80B9B3D8 4608603E */ c.le.s $f12, $f8 -/* 0025C 80B9B3DC 00000000 */ nop -/* 00260 80B9B3E0 4503FFFA */ bc1tl .L80B9B3CC -/* 00264 80B9B3E4 460C0180 */ add.s $f6, $f0, $f12 -/* 00268 80B9B3E8 10000011 */ beq $zero, $zero, .L80B9B430 -/* 0026C 80B9B3EC C4800010 */ lwc1 $f0, 0x0010($a0) ## 00000010 -/* 00270 80B9B3F0 46020281 */ sub.s $f10, $f0, $f2 -.L80B9B3F4: -/* 00274 80B9B3F4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00278 80B9B3F8 00000000 */ nop -/* 0027C 80B9B3FC 460A603E */ c.le.s $f12, $f10 -/* 00280 80B9B400 00000000 */ nop -/* 00284 80B9B404 4502000A */ bc1fl .L80B9B430 -/* 00288 80B9B408 C4800010 */ lwc1 $f0, 0x0010($a0) ## 00000010 -/* 0028C 80B9B40C 460C0401 */ sub.s $f16, $f0, $f12 -.L80B9B410: -/* 00290 80B9B410 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 -/* 00294 80B9B414 C4800008 */ lwc1 $f0, 0x0008($a0) ## 00000008 -/* 00298 80B9B418 46020481 */ sub.s $f18, $f0, $f2 -/* 0029C 80B9B41C 4612603E */ c.le.s $f12, $f18 -/* 002A0 80B9B420 00000000 */ nop -/* 002A4 80B9B424 4503FFFA */ bc1tl .L80B9B410 -/* 002A8 80B9B428 460C0401 */ sub.s $f16, $f0, $f12 -/* 002AC 80B9B42C C4800010 */ lwc1 $f0, 0x0010($a0) ## 00000010 -.L80B9B430: -/* 002B0 80B9B430 C482002C */ lwc1 $f2, 0x002C($a0) ## 0000002C -/* 002B4 80B9B434 4602003C */ c.lt.s $f0, $f2 -/* 002B8 80B9B438 00000000 */ nop -/* 002BC 80B9B43C 45020011 */ bc1fl .L80B9B484 -/* 002C0 80B9B440 46020281 */ sub.s $f10, $f0, $f2 -/* 002C4 80B9B444 46001101 */ sub.s $f4, $f2, $f0 -/* 002C8 80B9B448 4604603E */ c.le.s $f12, $f4 -/* 002CC 80B9B44C 00000000 */ nop -/* 002D0 80B9B450 45000018 */ bc1f .L80B9B4B4 -/* 002D4 80B9B454 00000000 */ nop -/* 002D8 80B9B458 460C0180 */ add.s $f6, $f0, $f12 -.L80B9B45C: -/* 002DC 80B9B45C E4860010 */ swc1 $f6, 0x0010($a0) ## 00000010 -/* 002E0 80B9B460 C4800010 */ lwc1 $f0, 0x0010($a0) ## 00000010 -/* 002E4 80B9B464 46001201 */ sub.s $f8, $f2, $f0 -/* 002E8 80B9B468 4608603E */ c.le.s $f12, $f8 -/* 002EC 80B9B46C 00000000 */ nop -/* 002F0 80B9B470 4503FFFA */ bc1tl .L80B9B45C -/* 002F4 80B9B474 460C0180 */ add.s $f6, $f0, $f12 -/* 002F8 80B9B478 03E00008 */ jr $ra -/* 002FC 80B9B47C 00000000 */ nop -.L80B9B480: -/* 00300 80B9B480 46020281 */ sub.s $f10, $f0, $f2 -.L80B9B484: -/* 00304 80B9B484 460A603E */ c.le.s $f12, $f10 -/* 00308 80B9B488 00000000 */ nop -/* 0030C 80B9B48C 45000009 */ bc1f .L80B9B4B4 -/* 00310 80B9B490 00000000 */ nop -/* 00314 80B9B494 460C0401 */ sub.s $f16, $f0, $f12 -.L80B9B498: -/* 00318 80B9B498 E4900010 */ swc1 $f16, 0x0010($a0) ## 00000010 -/* 0031C 80B9B49C C4800010 */ lwc1 $f0, 0x0010($a0) ## 00000010 -/* 00320 80B9B4A0 46020481 */ sub.s $f18, $f0, $f2 -/* 00324 80B9B4A4 4612603E */ c.le.s $f12, $f18 -/* 00328 80B9B4A8 00000000 */ nop -/* 0032C 80B9B4AC 4503FFFA */ bc1tl .L80B9B498 -/* 00330 80B9B4B0 460C0401 */ sub.s $f16, $f0, $f12 -.L80B9B4B4: -/* 00334 80B9B4B4 03E00008 */ jr $ra -/* 00338 80B9B4B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s deleted file mode 100644 index 881d1d47ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80B9B4BC -/* 0033C 80B9B4BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00340 80B9B4C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00344 80B9B4C4 14A00003 */ bne $a1, $zero, .L80B9B4D4 -/* 00348 80B9B4C8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0034C 80B9B4CC 10000029 */ beq $zero, $zero, .L80B9B574 -/* 00350 80B9B4D0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B9B4D4: -/* 00354 80B9B4D4 84EE0000 */ lh $t6, 0x0000($a3) ## 00000000 -/* 00358 80B9B4D8 2401012A */ addiu $at, $zero, 0x012A ## $at = 0000012A -/* 0035C 80B9B4DC 55C10025 */ bnel $t6, $at, .L80B9B574 -/* 00360 80B9B4E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00364 80B9B4E4 84E2001C */ lh $v0, 0x001C($a3) ## 0000001C -/* 00368 80B9B4E8 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 0036C 80B9B4EC 00022A03 */ sra $a1, $v0, 8 -/* 00370 80B9B4F0 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00374 80B9B4F4 00052C00 */ sll $a1, $a1, 16 -/* 00378 80B9B4F8 30430033 */ andi $v1, $v0, 0x0033 ## $v1 = 00000001 -/* 0037C 80B9B4FC 10610006 */ beq $v1, $at, .L80B9B518 -/* 00380 80B9B500 00052C03 */ sra $a1, $a1, 16 -/* 00384 80B9B504 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 00388 80B9B508 5061000F */ beql $v1, $at, .L80B9B548 -/* 0038C 80B9B50C 8488001C */ lh $t0, 0x001C($a0) ## 0000001C -/* 00390 80B9B510 10000018 */ beq $zero, $zero, .L80B9B574 -/* 00394 80B9B514 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B9B518: -/* 00398 80B9B518 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 0039C 80B9B51C 000FC203 */ sra $t8, $t7, 8 -/* 003A0 80B9B520 3319003F */ andi $t9, $t8, 0x003F ## $t9 = 00000000 -/* 003A4 80B9B524 54B90013 */ bnel $a1, $t9, .L80B9B574 -/* 003A8 80B9B528 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 003AC 80B9B52C 0C00B2D0 */ jal Flags_GetSwitch - -/* 003B0 80B9B530 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 003B4 80B9B534 5040000F */ beql $v0, $zero, .L80B9B574 -/* 003B8 80B9B538 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 003BC 80B9B53C 1000000D */ beq $zero, $zero, .L80B9B574 -/* 003C0 80B9B540 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 003C4 80B9B544 8488001C */ lh $t0, 0x001C($a0) ## 0000001C -.L80B9B548: -/* 003C8 80B9B548 00084A03 */ sra $t1, $t0, 8 -/* 003CC 80B9B54C 312A003F */ andi $t2, $t1, 0x003F ## $t2 = 00000000 -/* 003D0 80B9B550 54AA0008 */ bnel $a1, $t2, .L80B9B574 -/* 003D4 80B9B554 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 003D8 80B9B558 0C00B2D0 */ jal Flags_GetSwitch - -/* 003DC 80B9B55C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 003E0 80B9B560 54400004 */ bnel $v0, $zero, .L80B9B574 -/* 003E4 80B9B564 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 003E8 80B9B568 10000002 */ beq $zero, $zero, .L80B9B574 -/* 003EC 80B9B56C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 003F0 80B9B570 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B9B574: -/* 003F4 80B9B574 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003F8 80B9B578 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003FC 80B9B57C 03E00008 */ jr $ra -/* 00400 80B9B580 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s deleted file mode 100644 index 45b53a44a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s +++ /dev/null @@ -1,54 +0,0 @@ -.rdata -glabel D_80B9CB44 - .asciz "Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B9CB7C - .asciz "../z_obj_oshihiki.c" - .balign 4 - -.late_rodata -glabel jtbl_80B9CCBC - .word L80B9B5B8 - .word L80B9B5B8 - .word L80B9B5B8 - .word L80B9B5B8 - .word L80B9B5B8 - .word L80B9B5B8 - .word L80B9B5B8 - .word L80B9B5B8 - -.text -glabel func_80B9B584 -/* 00404 80B9B584 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00408 80B9B588 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0040C 80B9B58C 8487001C */ lh $a3, 0x001C($a0) ## 0000001C -/* 00410 80B9B590 240601BC */ addiu $a2, $zero, 0x01BC ## $a2 = 000001BC -/* 00414 80B9B594 30EE000F */ andi $t6, $a3, 0x000F ## $t6 = 00000000 -/* 00418 80B9B598 2DC10008 */ sltiu $at, $t6, 0x0008 -/* 0041C 80B9B59C 1020000C */ beq $at, $zero, .L80B9B5D0 -/* 00420 80B9B5A0 000E7080 */ sll $t6, $t6, 2 -/* 00424 80B9B5A4 3C0180BA */ lui $at, %hi(jtbl_80B9CCBC) ## $at = 80BA0000 -/* 00428 80B9B5A8 002E0821 */ addu $at, $at, $t6 -/* 0042C 80B9B5AC 8C2ECCBC */ lw $t6, %lo(jtbl_80B9CCBC)($at) -/* 00430 80B9B5B0 01C00008 */ jr $t6 -/* 00434 80B9B5B4 00000000 */ nop -glabel L80B9B5B8 -/* 00438 80B9B5B8 3C060500 */ lui $a2, 0x0500 ## $a2 = 05000000 -/* 0043C 80B9B5BC 24C64E98 */ addiu $a2, $a2, 0x4E98 ## $a2 = 05004E98 -/* 00440 80B9B5C0 0C2E6C60 */ jal func_80B9B180 -/* 00444 80B9B5C4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00448 80B9B5C8 10000007 */ beq $zero, $zero, .L80B9B5E8 -/* 0044C 80B9B5CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9B5D0: -/* 00450 80B9B5D0 3C0480BA */ lui $a0, %hi(D_80B9CB44) ## $a0 = 80BA0000 -/* 00454 80B9B5D4 3C0580BA */ lui $a1, %hi(D_80B9CB7C) ## $a1 = 80BA0000 -/* 00458 80B9B5D8 24A5CB7C */ addiu $a1, $a1, %lo(D_80B9CB7C) ## $a1 = 80B9CB7C -/* 0045C 80B9B5DC 0C00084C */ jal osSyncPrintf - -/* 00460 80B9B5E0 2484CB44 */ addiu $a0, $a0, %lo(D_80B9CB44) ## $a0 = 80B9CB44 -/* 00464 80B9B5E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9B5E8: -/* 00468 80B9B5E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0046C 80B9B5EC 03E00008 */ jr $ra -/* 00470 80B9B5F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s deleted file mode 100644 index 0b95b4fdc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B9B5F4 -/* 00474 80B9B5F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00478 80B9B5F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0047C 80B9B5FC AFA5001C */ sw $a1, 0x001C($sp) -/* 00480 80B9B600 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00484 80B9B604 3C0580BA */ lui $a1, %hi(D_80B9C9C0) ## $a1 = 80BA0000 -/* 00488 80B9B608 31CF000F */ andi $t7, $t6, 0x000F ## $t7 = 00000000 -/* 0048C 80B9B60C 000FC080 */ sll $t8, $t7, 2 -/* 00490 80B9B610 00B82821 */ addu $a1, $a1, $t8 -/* 00494 80B9B614 0C00B58B */ jal Actor_SetScale - -/* 00498 80B9B618 8CA5C9C0 */ lw $a1, %lo(D_80B9C9C0)($a1) -/* 0049C 80B9B61C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004A0 80B9B620 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004A4 80B9B624 03E00008 */ jr $ra -/* 004A8 80B9B628 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s deleted file mode 100644 index 5a439a6bab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s +++ /dev/null @@ -1,42 +0,0 @@ -.late_rodata -.late_rodata_alignment 4 -glabel jtbl_80B9CCDC - .word L80B9B658 - .word L80B9B658 - .word L80B9B668 - .word L80B9B678 - .word L80B9B658 - .word L80B9B658 - .word L80B9B668 - .word L80B9B678 - -.text -glabel func_80B9B62C -/* 004AC 80B9B62C AFA50004 */ sw $a1, 0x0004($sp) -/* 004B0 80B9B630 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 004B4 80B9B634 31CF000F */ andi $t7, $t6, 0x000F ## $t7 = 00000000 -/* 004B8 80B9B638 2DE10008 */ sltiu $at, $t7, 0x0008 -/* 004BC 80B9B63C 10200011 */ beq $at, $zero, .L80B9B684 -/* 004C0 80B9B640 000F7880 */ sll $t7, $t7, 2 -/* 004C4 80B9B644 3C0180BA */ lui $at, %hi(jtbl_80B9CCDC) ## $at = 80BA0000 -/* 004C8 80B9B648 002F0821 */ addu $at, $at, $t7 -/* 004CC 80B9B64C 8C2FCCDC */ lw $t7, %lo(jtbl_80B9CCDC)($at) -/* 004D0 80B9B650 01E00008 */ jr $t7 -/* 004D4 80B9B654 00000000 */ nop -glabel L80B9B658 -/* 004D8 80B9B658 3C180500 */ lui $t8, 0x0500 ## $t8 = 05000000 -/* 004DC 80B9B65C 27183350 */ addiu $t8, $t8, 0x3350 ## $t8 = 05003350 -/* 004E0 80B9B660 03E00008 */ jr $ra -/* 004E4 80B9B664 AC9801CC */ sw $t8, 0x01CC($a0) ## 000001CC -glabel L80B9B668 -/* 004E8 80B9B668 3C190500 */ lui $t9, 0x0500 ## $t9 = 05000000 -/* 004EC 80B9B66C 27393B50 */ addiu $t9, $t9, 0x3B50 ## $t9 = 05003B50 -/* 004F0 80B9B670 03E00008 */ jr $ra -/* 004F4 80B9B674 AC9901CC */ sw $t9, 0x01CC($a0) ## 000001CC -glabel L80B9B678 -/* 004F8 80B9B678 3C080500 */ lui $t0, 0x0500 ## $t0 = 05000000 -/* 004FC 80B9B67C 25084350 */ addiu $t0, $t0, 0x4350 ## $t0 = 05004350 -/* 00500 80B9B680 AC8801CC */ sw $t0, 0x01CC($a0) ## 000001CC -.L80B9B684: -/* 00504 80B9B684 03E00008 */ jr $ra -/* 00508 80B9B688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s deleted file mode 100644 index 4533deb23e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_80B9CB90 - .asciz "Error : scene_data_ID が判別できない。(%s %d)\n" - .balign 4 - -glabel D_80B9CBC0 - .asciz "../z_obj_oshihiki.c" - .balign 4 - -.text -glabel func_80B9B68C -/* 0050C 80B9B68C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00510 80B9B690 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 80B9B694 8488001C */ lh $t0, 0x001C($a0) ## 0000001C -/* 00518 80B9B698 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0051C 80B9B69C 3C0280BA */ lui $v0, %hi(D_80B9CA4C) ## $v0 = 80BA0000 -/* 00520 80B9B6A0 00084183 */ sra $t0, $t0, 6 -/* 00524 80B9B6A4 31080003 */ andi $t0, $t0, 0x0003 ## $t0 = 00000000 -/* 00528 80B9B6A8 00084400 */ sll $t0, $t0, 16 -/* 0052C 80B9B6AC 00084403 */ sra $t0, $t0, 16 -/* 00530 80B9B6B0 2442CA4C */ addiu $v0, $v0, %lo(D_80B9CA4C) ## $v0 = 80B9CA4C -/* 00534 80B9B6B4 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00538 80B9B6B8 84A600A4 */ lh $a2, 0x00A4($a1) ## 000000A4 -/* 0053C 80B9B6BC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B9B6C0: -/* 00540 80B9B6C0 844E0000 */ lh $t6, 0x0000($v0) ## 80B9CA4C -/* 00544 80B9B6C4 50CE0005 */ beql $a2, $t6, .L80B9B6DC -/* 00548 80B9B6C8 28610009 */ slti $at, $v1, 0x0009 -/* 0054C 80B9B6CC 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00550 80B9B6D0 1464FFFB */ bne $v1, $a0, .L80B9B6C0 -/* 00554 80B9B6D4 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 80B9CA4E -/* 00558 80B9B6D8 28610009 */ slti $at, $v1, 0x0009 -.L80B9B6DC: -/* 0055C 80B9B6DC 1420000F */ bne $at, $zero, .L80B9B71C -/* 00560 80B9B6E0 0003C080 */ sll $t8, $v1, 2 -/* 00564 80B9B6E4 3C0480BA */ lui $a0, %hi(D_80B9CB90) ## $a0 = 80BA0000 -/* 00568 80B9B6E8 3C0580BA */ lui $a1, %hi(D_80B9CBC0) ## $a1 = 80BA0000 -/* 0056C 80B9B6EC 24A5CBC0 */ addiu $a1, $a1, %lo(D_80B9CBC0) ## $a1 = 80B9CBC0 -/* 00570 80B9B6F0 2484CB90 */ addiu $a0, $a0, %lo(D_80B9CB90) ## $a0 = 80B9CB90 -/* 00574 80B9B6F4 24060243 */ addiu $a2, $zero, 0x0243 ## $a2 = 00000243 -/* 00578 80B9B6F8 0C00084C */ jal osSyncPrintf - -/* 0057C 80B9B6FC AFA70018 */ sw $a3, 0x0018($sp) -/* 00580 80B9B700 8FA70018 */ lw $a3, 0x0018($sp) -/* 00584 80B9B704 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00588 80B9B708 24E201D0 */ addiu $v0, $a3, 0x01D0 ## $v0 = 000001D0 -/* 0058C 80B9B70C A0430002 */ sb $v1, 0x0002($v0) ## 000001D2 -/* 00590 80B9B710 A0430001 */ sb $v1, 0x0001($v0) ## 000001D1 -/* 00594 80B9B714 10000010 */ beq $zero, $zero, .L80B9B758 -/* 00598 80B9B718 A0430000 */ sb $v1, 0x0000($v0) ## 000001D0 -.L80B9B71C: -/* 0059C 80B9B71C 0303C023 */ subu $t8, $t8, $v1 -/* 005A0 80B9B720 0008C880 */ sll $t9, $t0, 2 -/* 005A4 80B9B724 0328C823 */ subu $t9, $t9, $t0 -/* 005A8 80B9B728 0018C080 */ sll $t8, $t8, 2 -/* 005AC 80B9B72C 3C0A80BA */ lui $t2, %hi(D_80B9C9E0) ## $t2 = 80BA0000 -/* 005B0 80B9B730 254AC9E0 */ addiu $t2, $t2, %lo(D_80B9C9E0) ## $t2 = 80B9C9E0 -/* 005B4 80B9B734 03194821 */ addu $t1, $t8, $t9 -/* 005B8 80B9B738 012A2021 */ addu $a0, $t1, $t2 -/* 005BC 80B9B73C 908B0000 */ lbu $t3, 0x0000($a0) ## 00000000 -/* 005C0 80B9B740 24E201D0 */ addiu $v0, $a3, 0x01D0 ## $v0 = 000001D0 -/* 005C4 80B9B744 A04B0000 */ sb $t3, 0x0000($v0) ## 000001D0 -/* 005C8 80B9B748 908C0001 */ lbu $t4, 0x0001($a0) ## 00000001 -/* 005CC 80B9B74C A04C0001 */ sb $t4, 0x0001($v0) ## 000001D1 -/* 005D0 80B9B750 908D0002 */ lbu $t5, 0x0002($a0) ## 00000002 -/* 005D4 80B9B754 A04D0002 */ sb $t5, 0x0002($v0) ## 000001D2 -.L80B9B758: -/* 005D8 80B9B758 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005DC 80B9B75C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005E0 80B9B760 03E00008 */ jr $ra -/* 005E4 80B9B764 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s deleted file mode 100644 index 5bd979026e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_80B9B8C8 -/* 00748 80B9B8C8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 0074C 80B9B8CC AFBE0050 */ sw $s8, 0x0050($sp) -/* 00750 80B9B8D0 AFB10034 */ sw $s1, 0x0034($sp) -/* 00754 80B9B8D4 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 00758 80B9B8D8 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0075C 80B9B8DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00760 80B9B8E0 AFB7004C */ sw $s7, 0x004C($sp) -/* 00764 80B9B8E4 AFB60048 */ sw $s6, 0x0048($sp) -/* 00768 80B9B8E8 AFB50044 */ sw $s5, 0x0044($sp) -/* 0076C 80B9B8EC AFB40040 */ sw $s4, 0x0040($sp) -/* 00770 80B9B8F0 AFB3003C */ sw $s3, 0x003C($sp) -/* 00774 80B9B8F4 AFB20038 */ sw $s2, 0x0038($sp) -/* 00778 80B9B8F8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0077C 80B9B8FC 3C1180BA */ lui $s1, %hi(D_80B9CA6C) ## $s1 = 80BA0000 -/* 00780 80B9B900 3C1E80BA */ lui $s8, %hi(D_80B9CAA8) ## $s8 = 80BA0000 -/* 00784 80B9B904 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 -/* 00788 80B9B908 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 0078C 80B9B90C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00790 80B9B910 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00794 80B9B914 27DECAA8 */ addiu $s8, $s8, %lo(D_80B9CAA8) ## $s8 = 80B9CAA8 -/* 00798 80B9B918 2631CA6C */ addiu $s1, $s1, %lo(D_80B9CA6C) ## $s1 = 80B9CA6C -/* 0079C 80B9B91C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 007A0 80B9B920 24930194 */ addiu $s3, $a0, 0x0194 ## $s3 = 00000194 -/* 007A4 80B9B924 24940180 */ addiu $s4, $a0, 0x0180 ## $s4 = 00000180 -/* 007A8 80B9B928 27B50080 */ addiu $s5, $sp, 0x0080 ## $s5 = FFFFFFF0 -/* 007AC 80B9B92C 24B607C0 */ addiu $s6, $a1, 0x07C0 ## $s6 = 000007C0 -/* 007B0 80B9B930 27B70074 */ addiu $s7, $sp, 0x0074 ## $s7 = FFFFFFE4 -.L80B9B934: -/* 007B4 80B9B934 C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 007B8 80B9B938 C6240000 */ lwc1 $f4, 0x0000($s1) ## 80B9CA6C -/* 007BC 80B9B93C C6300004 */ lwc1 $f16, 0x0004($s1) ## 80B9CA70 -/* 007C0 80B9B940 46143202 */ mul.s $f8, $f6, $f20 -/* 007C4 80B9B944 02A02025 */ or $a0, $s5, $zero ## $a0 = FFFFFFF0 -/* 007C8 80B9B948 02E02825 */ or $a1, $s7, $zero ## $a1 = FFFFFFE4 -/* 007CC 80B9B94C 46082282 */ mul.s $f10, $f4, $f8 -/* 007D0 80B9B950 C6280008 */ lwc1 $f8, 0x0008($s1) ## 80B9CA74 -/* 007D4 80B9B954 E7AA0074 */ swc1 $f10, 0x0074($sp) -/* 007D8 80B9B958 C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 -/* 007DC 80B9B95C 46149182 */ mul.s $f6, $f18, $f20 -/* 007E0 80B9B960 00000000 */ nop -/* 007E4 80B9B964 46068102 */ mul.s $f4, $f16, $f6 -/* 007E8 80B9B968 E7A40078 */ swc1 $f4, 0x0078($sp) -/* 007EC 80B9B96C C60A0058 */ lwc1 $f10, 0x0058($s0) ## 00000058 -/* 007F0 80B9B970 46145482 */ mul.s $f18, $f10, $f20 -/* 007F4 80B9B974 00000000 */ nop -/* 007F8 80B9B978 46124402 */ mul.s $f16, $f8, $f18 -/* 007FC 80B9B97C E7B0007C */ swc1 $f16, 0x007C($sp) -/* 00800 80B9B980 8E070170 */ lw $a3, 0x0170($s0) ## 00000170 -/* 00804 80B9B984 0C2E6C82 */ jal func_80B9B208 -/* 00808 80B9B988 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 0080C 80B9B98C C7A60080 */ lwc1 $f6, 0x0080($sp) -/* 00810 80B9B990 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00814 80B9B994 C7A80084 */ lwc1 $f8, 0x0084($sp) -/* 00818 80B9B998 02C02025 */ or $a0, $s6, $zero ## $a0 = 000007C0 -/* 0081C 80B9B99C 46043280 */ add.s $f10, $f6, $f4 -/* 00820 80B9B9A0 C7A60088 */ lwc1 $f6, 0x0088($sp) -/* 00824 80B9B9A4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000194 -/* 00828 80B9B9A8 02803025 */ or $a2, $s4, $zero ## $a2 = 00000180 -/* 0082C 80B9B9AC E7AA0080 */ swc1 $f10, 0x0080($sp) -/* 00830 80B9B9B0 C6120104 */ lwc1 $f18, 0x0104($s0) ## 00000104 -/* 00834 80B9B9B4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00838 80B9B9B8 46124400 */ add.s $f16, $f8, $f18 -/* 0083C 80B9B9BC E7B00084 */ swc1 $f16, 0x0084($sp) -/* 00840 80B9B9C0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00844 80B9B9C4 E7B60014 */ swc1 $f22, 0x0014($sp) -/* 00848 80B9B9C8 AFB50010 */ sw $s5, 0x0010($sp) -/* 0084C 80B9B9CC 46043280 */ add.s $f10, $f6, $f4 -/* 00850 80B9B9D0 0C00F299 */ jal func_8003CA64 -/* 00854 80B9B9D4 E7AA0088 */ swc1 $f10, 0x0088($sp) -/* 00858 80B9B9D8 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 80B9CA78 -/* 0085C 80B9B9DC 26520004 */ addiu $s2, $s2, 0x0004 ## $s2 = 00000004 -/* 00860 80B9B9E0 26730004 */ addiu $s3, $s3, 0x0004 ## $s3 = 00000198 -/* 00864 80B9B9E4 26940004 */ addiu $s4, $s4, 0x0004 ## $s4 = 00000184 -/* 00868 80B9B9E8 163EFFD2 */ bne $s1, $s8, .L80B9B934 -/* 0086C 80B9B9EC E64001A4 */ swc1 $f0, 0x01A4($s2) ## 000001A8 -/* 00870 80B9B9F0 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00874 80B9B9F4 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00878 80B9B9F8 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 0087C 80B9B9FC 8FB00030 */ lw $s0, 0x0030($sp) -/* 00880 80B9BA00 8FB10034 */ lw $s1, 0x0034($sp) -/* 00884 80B9BA04 8FB20038 */ lw $s2, 0x0038($sp) -/* 00888 80B9BA08 8FB3003C */ lw $s3, 0x003C($sp) -/* 0088C 80B9BA0C 8FB40040 */ lw $s4, 0x0040($sp) -/* 00890 80B9BA10 8FB50044 */ lw $s5, 0x0044($sp) -/* 00894 80B9BA14 8FB60048 */ lw $s6, 0x0048($sp) -/* 00898 80B9BA18 8FB7004C */ lw $s7, 0x004C($sp) -/* 0089C 80B9BA1C 8FBE0050 */ lw $s8, 0x0050($sp) -/* 008A0 80B9BA20 03E00008 */ jr $ra -/* 008A4 80B9BA24 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s deleted file mode 100644 index c4c3182758..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s +++ /dev/null @@ -1,103 +0,0 @@ -.late_rodata -glabel D_80B9CCFC - .float -0.001 - -glabel D_80B9CD00 - .float -0.001 - -.text -glabel func_80B9BA28 -/* 008A8 80B9BA28 24820004 */ addiu $v0, $a0, 0x0004 ## $v0 = 00000004 -/* 008AC 80B9BA2C C44001A8 */ lwc1 $f0, 0x01A8($v0) ## 000001AC -/* 008B0 80B9BA30 C48201A8 */ lwc1 $f2, 0x01A8($a0) ## 000001A8 -/* 008B4 80B9BA34 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 008B8 80B9BA38 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 008BC 80B9BA3C 4600103C */ c.lt.s $f2, $f0 -/* 008C0 80B9BA40 00000000 */ nop -/* 008C4 80B9BA44 45020004 */ bc1fl .L80B9BA58 -/* 008C8 80B9BA48 8C4E0180 */ lw $t6, 0x0180($v0) ## 00000184 -/* 008CC 80B9BA4C 1000000D */ beq $zero, $zero, .L80B9BA84 -/* 008D0 80B9BA50 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 008D4 80B9BA54 8C4E0180 */ lw $t6, 0x0180($v0) ## 00000184 -.L80B9BA58: -/* 008D8 80B9BA58 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 008DC 80B9BA5C 3C0180BA */ lui $at, %hi(D_80B9CCFC) ## $at = 80BA0000 -/* 008E0 80B9BA60 54AE0009 */ bnel $a1, $t6, .L80B9BA88 -/* 008E4 80B9BA64 00037880 */ sll $t7, $v1, 2 -/* 008E8 80B9BA68 46020101 */ sub.s $f4, $f0, $f2 -/* 008EC 80B9BA6C C42CCCFC */ lwc1 $f12, %lo(D_80B9CCFC)($at) -/* 008F0 80B9BA70 4604603C */ c.lt.s $f12, $f4 -/* 008F4 80B9BA74 00000000 */ nop -/* 008F8 80B9BA78 45020003 */ bc1fl .L80B9BA88 -/* 008FC 80B9BA7C 00037880 */ sll $t7, $v1, 2 -/* 00900 80B9BA80 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80B9BA84: -/* 00904 80B9BA84 00037880 */ sll $t7, $v1, 2 -.L80B9BA88: -/* 00908 80B9BA88 008FC021 */ addu $t8, $a0, $t7 -/* 0090C 80B9BA8C C70001A8 */ lwc1 $f0, 0x01A8($t8) ## 000001A8 -/* 00910 80B9BA90 C44201AC */ lwc1 $f2, 0x01AC($v0) ## 000001B0 -/* 00914 80B9BA94 3C0180BA */ lui $at, %hi(D_80B9CD00) ## $at = 80BA0000 -/* 00918 80B9BA98 C42CCD00 */ lwc1 $f12, %lo(D_80B9CD00)($at) -/* 0091C 80B9BA9C 4602003C */ c.lt.s $f0, $f2 -/* 00920 80B9BAA0 00000000 */ nop -/* 00924 80B9BAA4 45020005 */ bc1fl .L80B9BABC -/* 00928 80B9BAA8 8C590184 */ lw $t9, 0x0184($v0) ## 00000188 -/* 0092C 80B9BAAC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00930 80B9BAB0 1000000B */ beq $zero, $zero, .L80B9BAE0 -/* 00934 80B9BAB4 C48001B0 */ lwc1 $f0, 0x01B0($a0) ## 000001B0 -/* 00938 80B9BAB8 8C590184 */ lw $t9, 0x0184($v0) ## 00000188 -.L80B9BABC: -/* 0093C 80B9BABC 54B90009 */ bnel $a1, $t9, .L80B9BAE4 -/* 00940 80B9BAC0 C44201B0 */ lwc1 $f2, 0x01B0($v0) ## 000001B4 -/* 00944 80B9BAC4 46001181 */ sub.s $f6, $f2, $f0 -/* 00948 80B9BAC8 4606603C */ c.lt.s $f12, $f6 -/* 0094C 80B9BACC 00000000 */ nop -/* 00950 80B9BAD0 45020004 */ bc1fl .L80B9BAE4 -/* 00954 80B9BAD4 C44201B0 */ lwc1 $f2, 0x01B0($v0) ## 000001B4 -/* 00958 80B9BAD8 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 0095C 80B9BADC C48001B0 */ lwc1 $f0, 0x01B0($a0) ## 000001B0 -.L80B9BAE0: -/* 00960 80B9BAE0 C44201B0 */ lwc1 $f2, 0x01B0($v0) ## 000001B4 -.L80B9BAE4: -/* 00964 80B9BAE4 4602003C */ c.lt.s $f0, $f2 -/* 00968 80B9BAE8 00000000 */ nop -/* 0096C 80B9BAEC 45020005 */ bc1fl .L80B9BB04 -/* 00970 80B9BAF0 8C480188 */ lw $t0, 0x0188($v0) ## 0000018C -/* 00974 80B9BAF4 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 00978 80B9BAF8 1000000B */ beq $zero, $zero, .L80B9BB28 -/* 0097C 80B9BAFC C48001B4 */ lwc1 $f0, 0x01B4($a0) ## 000001B4 -/* 00980 80B9BB00 8C480188 */ lw $t0, 0x0188($v0) ## 0000018C -.L80B9BB04: -/* 00984 80B9BB04 54A80009 */ bnel $a1, $t0, .L80B9BB2C -/* 00988 80B9BB08 C44201B4 */ lwc1 $f2, 0x01B4($v0) ## 000001B8 -/* 0098C 80B9BB0C 46001201 */ sub.s $f8, $f2, $f0 -/* 00990 80B9BB10 4608603C */ c.lt.s $f12, $f8 -/* 00994 80B9BB14 00000000 */ nop -/* 00998 80B9BB18 45020004 */ bc1fl .L80B9BB2C -/* 0099C 80B9BB1C C44201B4 */ lwc1 $f2, 0x01B4($v0) ## 000001B8 -/* 009A0 80B9BB20 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 009A4 80B9BB24 C48001B4 */ lwc1 $f0, 0x01B4($a0) ## 000001B4 -.L80B9BB28: -/* 009A8 80B9BB28 C44201B4 */ lwc1 $f2, 0x01B4($v0) ## 000001B8 -.L80B9BB2C: -/* 009AC 80B9BB2C 4602003C */ c.lt.s $f0, $f2 -/* 009B0 80B9BB30 00000000 */ nop -/* 009B4 80B9BB34 45020004 */ bc1fl .L80B9BB48 -/* 009B8 80B9BB38 8C49018C */ lw $t1, 0x018C($v0) ## 00000190 -/* 009BC 80B9BB3C 03E00008 */ jr $ra -/* 009C0 80B9BB40 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80B9BB44: -/* 009C4 80B9BB44 8C49018C */ lw $t1, 0x018C($v0) ## 00000190 -.L80B9BB48: -/* 009C8 80B9BB48 14A90007 */ bne $a1, $t1, .L80B9BB68 -/* 009CC 80B9BB4C 00000000 */ nop -/* 009D0 80B9BB50 46001281 */ sub.s $f10, $f2, $f0 -/* 009D4 80B9BB54 460A603C */ c.lt.s $f12, $f10 -/* 009D8 80B9BB58 00000000 */ nop -/* 009DC 80B9BB5C 45000002 */ bc1f .L80B9BB68 -/* 009E0 80B9BB60 00000000 */ nop -/* 009E4 80B9BB64 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -.L80B9BB68: -/* 009E8 80B9BB68 03E00008 */ jr $ra -/* 009EC 80B9BB6C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s deleted file mode 100644 index 105f4f64a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B9BB70 -/* 009F0 80B9BB70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009F4 80B9BB74 AFBF001C */ sw $ra, 0x001C($sp) -/* 009F8 80B9BB78 AFB00018 */ sw $s0, 0x0018($sp) -/* 009FC 80B9BB7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A00 80B9BB80 0C2E6CB6 */ jal func_80B9B2D8 -/* 00A04 80B9BB84 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A08 80B9BB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A0C 80B9BB8C 0C2E6E32 */ jal func_80B9B8C8 -/* 00A10 80B9BB90 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A14 80B9BB94 0C2E6E8A */ jal func_80B9BA28 -/* 00A18 80B9BB98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A1C 80B9BB9C A60201BC */ sh $v0, 0x01BC($s0) ## 000001BC -/* 00A20 80B9BBA0 860E01BC */ lh $t6, 0x01BC($s0) ## 000001BC -/* 00A24 80B9BBA4 000E7880 */ sll $t7, $t6, 2 -/* 00A28 80B9BBA8 020FC021 */ addu $t8, $s0, $t7 -/* 00A2C 80B9BBAC C70401A8 */ lwc1 $f4, 0x01A8($t8) ## 000001A8 -/* 00A30 80B9BBB0 E6040080 */ swc1 $f4, 0x0080($s0) ## 00000080 -/* 00A34 80B9BBB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A38 80B9BBB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A3C 80B9BBBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A40 80B9BBC0 03E00008 */ jr $ra -/* 00A44 80B9BBC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s deleted file mode 100644 index 1f0983af38..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s +++ /dev/null @@ -1,29 +0,0 @@ -.late_rodata -glabel D_80B9CD04 - .float -0.001 - -.text -glabel func_80B9BBC8 -/* 00A48 80B9BBC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A4C 80B9BBCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A50 80B9BBD0 0C2E6EDC */ jal func_80B9BB70 -/* 00A54 80B9BBD4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A58 80B9BBD8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A5C 80B9BBDC 3C0180BA */ lui $at, %hi(D_80B9CD04) ## $at = 80BA0000 -/* 00A60 80B9BBE0 C428CD04 */ lwc1 $f8, %lo(D_80B9CD04)($at) -/* 00A64 80B9BBE4 C4800080 */ lwc1 $f0, 0x0080($a0) ## 00000080 -/* 00A68 80B9BBE8 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00A6C 80B9BBEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00A70 80B9BBF0 46040181 */ sub.s $f6, $f0, $f4 -/* 00A74 80B9BBF4 4606403E */ c.le.s $f8, $f6 -/* 00A78 80B9BBF8 00000000 */ nop -/* 00A7C 80B9BBFC 45000004 */ bc1f .L80B9BC10 -/* 00A80 80B9BC00 00000000 */ nop -/* 00A84 80B9BC04 E4800028 */ swc1 $f0, 0x0028($a0) ## 00000028 -/* 00A88 80B9BC08 10000001 */ beq $zero, $zero, .L80B9BC10 -/* 00A8C 80B9BC0C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B9BC10: -/* 00A90 80B9BC10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A94 80B9BC14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A98 80B9BC18 03E00008 */ jr $ra -/* 00A9C 80B9BC1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s deleted file mode 100644 index 8edc722f86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s +++ /dev/null @@ -1,60 +0,0 @@ -.rdata -glabel D_80B9CC08 - .asciz "Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B9CC48 - .asciz "../z_obj_oshihiki.c" - .balign 4 - -.late_rodata -glabel D_80B9CD08 - .float -31990.0 - -glabel D_80B9CD0C - .float -0.001 - -.text -glabel func_80B9BC20 -/* 00AA0 80B9BC20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00AA4 80B9BC24 AFBF001C */ sw $ra, 0x001C($sp) -/* 00AA8 80B9BC28 AFB00018 */ sw $s0, 0x0018($sp) -/* 00AAC 80B9BC2C AFA50024 */ sw $a1, 0x0024($sp) -/* 00AB0 80B9BC30 3C0180BA */ lui $at, %hi(D_80B9CD08) ## $at = 80BA0000 -/* 00AB4 80B9BC34 C424CD08 */ lwc1 $f4, %lo(D_80B9CD08)($at) -/* 00AB8 80B9BC38 C4800028 */ lwc1 $f0, 0x0028($a0) ## 00000028 -/* 00ABC 80B9BC3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AC0 80B9BC40 3C0480BA */ lui $a0, %hi(D_80B9CC08) ## $a0 = 80BA0000 -/* 00AC4 80B9BC44 4604003E */ c.le.s $f0, $f4 -/* 00AC8 80B9BC48 3C0580BA */ lui $a1, %hi(D_80B9CC48) ## $a1 = 80BA0000 -/* 00ACC 80B9BC4C 24A5CC48 */ addiu $a1, $a1, %lo(D_80B9CC48) ## $a1 = 80B9CC48 -/* 00AD0 80B9BC50 2484CC08 */ addiu $a0, $a0, %lo(D_80B9CC08) ## $a0 = 80B9CC08 -/* 00AD4 80B9BC54 45000007 */ bc1f .L80B9BC74 -/* 00AD8 80B9BC58 24060329 */ addiu $a2, $zero, 0x0329 ## $a2 = 00000329 -/* 00ADC 80B9BC5C 0C00084C */ jal osSyncPrintf - -/* 00AE0 80B9BC60 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 00AE4 80B9BC64 0C00B55C */ jal Actor_Kill - -/* 00AE8 80B9BC68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AEC 80B9BC6C 1000000D */ beq $zero, $zero, .L80B9BCA4 -/* 00AF0 80B9BC70 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B9BC74: -/* 00AF4 80B9BC74 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 -/* 00AF8 80B9BC78 3C0180BA */ lui $at, %hi(D_80B9CD0C) ## $at = 80BA0000 -/* 00AFC 80B9BC7C C428CD0C */ lwc1 $f8, %lo(D_80B9CD0C)($at) -/* 00B00 80B9BC80 46001181 */ sub.s $f6, $f2, $f0 -/* 00B04 80B9BC84 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00B08 80B9BC88 4606403E */ c.le.s $f8, $f6 -/* 00B0C 80B9BC8C 00000000 */ nop -/* 00B10 80B9BC90 45000004 */ bc1f .L80B9BCA4 -/* 00B14 80B9BC94 00000000 */ nop -/* 00B18 80B9BC98 E6020028 */ swc1 $f2, 0x0028($s0) ## 00000028 -/* 00B1C 80B9BC9C 10000001 */ beq $zero, $zero, .L80B9BCA4 -/* 00B20 80B9BCA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B9BCA4: -/* 00B24 80B9BCA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B28 80B9BCA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B2C 80B9BCAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B30 80B9BCB0 03E00008 */ jr $ra -/* 00B34 80B9BCB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s deleted file mode 100644 index 3b3e4d6374..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s +++ /dev/null @@ -1,156 +0,0 @@ -glabel func_80B9BCB8 -/* 00B38 80B9BCB8 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 00B3C 80B9BCBC F7BC0058 */ sdc1 $f28, 0x0058($sp) -/* 00B40 80B9BCC0 4480E000 */ mtc1 $zero, $f28 ## $f28 = 0.00 -/* 00B44 80B9BCC4 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00B48 80B9BCC8 AFB00068 */ sw $s0, 0x0068($sp) -/* 00B4C 80B9BCCC 00058400 */ sll $s0, $a1, 16 -/* 00B50 80B9BCD0 460CE03E */ c.le.s $f28, $f12 -/* 00B54 80B9BCD4 AFB30074 */ sw $s3, 0x0074($sp) -/* 00B58 80B9BCD8 AFB20070 */ sw $s2, 0x0070($sp) -/* 00B5C 80B9BCDC 00E09025 */ or $s2, $a3, $zero ## $s2 = 00000000 -/* 00B60 80B9BCE0 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 00B64 80B9BCE4 00108403 */ sra $s0, $s0, 16 -/* 00B68 80B9BCE8 AFBF008C */ sw $ra, 0x008C($sp) -/* 00B6C 80B9BCEC AFBE0088 */ sw $s8, 0x0088($sp) -/* 00B70 80B9BCF0 AFB70084 */ sw $s7, 0x0084($sp) -/* 00B74 80B9BCF4 AFB60080 */ sw $s6, 0x0080($sp) -/* 00B78 80B9BCF8 AFB5007C */ sw $s5, 0x007C($sp) -/* 00B7C 80B9BCFC AFB40078 */ sw $s4, 0x0078($sp) -/* 00B80 80B9BD00 AFB1006C */ sw $s1, 0x006C($sp) -/* 00B84 80B9BD04 F7BE0060 */ sdc1 $f30, 0x0060($sp) -/* 00B88 80B9BD08 F7BA0050 */ sdc1 $f26, 0x0050($sp) -/* 00B8C 80B9BD0C F7B80048 */ sdc1 $f24, 0x0048($sp) -/* 00B90 80B9BD10 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 00B94 80B9BD14 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 00B98 80B9BD18 45000005 */ bc1f .L80B9BD30 -/* 00B9C 80B9BD1C AFA500F4 */ sw $a1, 0x00F4($sp) -/* 00BA0 80B9BD20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00BA4 80B9BD24 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00BA8 80B9BD28 10000005 */ beq $zero, $zero, .L80B9BD40 -/* 00BAC 80B9BD2C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -.L80B9BD30: -/* 00BB0 80B9BD30 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00BB4 80B9BD34 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 00BB8 80B9BD38 00000000 */ nop -/* 00BBC 80B9BD3C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -.L80B9BD40: -/* 00BC0 80B9BD40 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 -/* 00BC4 80B9BD44 C6460050 */ lwc1 $f6, 0x0050($s2) ## 00000050 -/* 00BC8 80B9BD48 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00BCC 80B9BD4C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00BD0 80B9BD50 46062202 */ mul.s $f8, $f4, $f6 -/* 00BD4 80B9BD54 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00BD8 80B9BD58 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 00BDC 80B9BD5C 00102400 */ sll $a0, $s0, 16 -/* 00BE0 80B9BD60 00042403 */ sra $a0, $a0, 16 -/* 00BE4 80B9BD64 460A4400 */ add.s $f16, $f8, $f10 -/* 00BE8 80B9BD68 46128101 */ sub.s $f4, $f16, $f18 -/* 00BEC 80B9BD6C 46040502 */ mul.s $f20, $f0, $f4 -/* 00BF0 80B9BD70 0C01DE1C */ jal Math_Sins - ## sins? -/* 00BF4 80B9BD74 00000000 */ nop -/* 00BF8 80B9BD78 00102400 */ sll $a0, $s0, 16 -/* 00BFC 80B9BD7C 46000786 */ mov.s $f30, $f0 -/* 00C00 80B9BD80 0C01DE0D */ jal Math_Coss - ## coss? -/* 00C04 80B9BD84 00042403 */ sra $a0, $a0, 16 -/* 00C08 80B9BD88 461EA602 */ mul.s $f24, $f20, $f30 -/* 00C0C 80B9BD8C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00C10 80B9BD90 3C1180BA */ lui $s1, %hi(D_80B9CAC8) ## $s1 = 80BA0000 -/* 00C14 80B9BD94 4600A682 */ mul.s $f26, $f20, $f0 -/* 00C18 80B9BD98 3C1080BA */ lui $s0, %hi(D_80B9CAA8) ## $s0 = 80BA0000 -/* 00C1C 80B9BD9C 267407C0 */ addiu $s4, $s3, 0x07C0 ## $s4 = 000007C0 -/* 00C20 80B9BDA0 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 -/* 00C24 80B9BDA4 46000586 */ mov.s $f22, $f0 -/* 00C28 80B9BDA8 27B300D4 */ addiu $s3, $sp, 0x00D4 ## $s3 = FFFFFFE4 -/* 00C2C 80B9BDAC 2610CAA8 */ addiu $s0, $s0, %lo(D_80B9CAA8) ## $s0 = 80B9CAA8 -/* 00C30 80B9BDB0 2631CAC8 */ addiu $s1, $s1, %lo(D_80B9CAC8) ## $s1 = 80B9CAC8 -/* 00C34 80B9BDB4 27BE00A8 */ addiu $s8, $sp, 0x00A8 ## $s8 = FFFFFFB8 -/* 00C38 80B9BDB8 27B700BC */ addiu $s7, $sp, 0x00BC ## $s7 = FFFFFFCC -/* 00C3C 80B9BDBC 27B600C8 */ addiu $s6, $sp, 0x00C8 ## $s6 = FFFFFFD8 -/* 00C40 80B9BDC0 27B500B0 */ addiu $s5, $sp, 0x00B0 ## $s5 = FFFFFFC0 -.L80B9BDC4: -/* 00C44 80B9BDC4 C6060000 */ lwc1 $f6, 0x0000($s0) ## 80B9CAA8 -/* 00C48 80B9BDC8 C6480050 */ lwc1 $f8, 0x0050($s2) ## 00000050 -/* 00C4C 80B9BDCC C6320000 */ lwc1 $f18, 0x0000($s1) ## 80B9CAC8 -/* 00C50 80B9BDD0 4406F000 */ mfc1 $a2, $f30 -/* 00C54 80B9BDD4 46083282 */ mul.s $f10, $f6, $f8 -/* 00C58 80B9BDD8 C6060004 */ lwc1 $f6, 0x0004($s0) ## 80B9CAAC -/* 00C5C 80B9BDDC 4407B000 */ mfc1 $a3, $f22 -/* 00C60 80B9BDE0 02602025 */ or $a0, $s3, $zero ## $a0 = FFFFFFE4 -/* 00C64 80B9BDE4 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFC0 -/* 00C68 80B9BDE8 46145402 */ mul.s $f16, $f10, $f20 -/* 00C6C 80B9BDEC 46109100 */ add.s $f4, $f18, $f16 -/* 00C70 80B9BDF0 C6300004 */ lwc1 $f16, 0x0004($s1) ## 80B9CACC -/* 00C74 80B9BDF4 E7A400B0 */ swc1 $f4, 0x00B0($sp) -/* 00C78 80B9BDF8 C6480054 */ lwc1 $f8, 0x0054($s2) ## 00000054 -/* 00C7C 80B9BDFC E7BC00B8 */ swc1 $f28, 0x00B8($sp) -/* 00C80 80B9BE00 46083282 */ mul.s $f10, $f6, $f8 -/* 00C84 80B9BE04 00000000 */ nop -/* 00C88 80B9BE08 46145482 */ mul.s $f18, $f10, $f20 -/* 00C8C 80B9BE0C 46128100 */ add.s $f4, $f16, $f18 -/* 00C90 80B9BE10 0C2E6C82 */ jal func_80B9B208 -/* 00C94 80B9BE14 E7A400B4 */ swc1 $f4, 0x00B4($sp) -/* 00C98 80B9BE18 C7A600D4 */ lwc1 $f6, 0x00D4($sp) -/* 00C9C 80B9BE1C C6480024 */ lwc1 $f8, 0x0024($s2) ## 00000024 -/* 00CA0 80B9BE20 C7B000D8 */ lwc1 $f16, 0x00D8($sp) -/* 00CA4 80B9BE24 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00CA8 80B9BE28 46083280 */ add.s $f10, $f6, $f8 -/* 00CAC 80B9BE2C C7A600DC */ lwc1 $f6, 0x00DC($sp) -/* 00CB0 80B9BE30 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00CB4 80B9BE34 27B800AC */ addiu $t8, $sp, 0x00AC ## $t8 = FFFFFFBC -/* 00CB8 80B9BE38 E7AA00D4 */ swc1 $f10, 0x00D4($sp) -/* 00CBC 80B9BE3C C6520028 */ lwc1 $f18, 0x0028($s2) ## 00000028 -/* 00CC0 80B9BE40 02802025 */ or $a0, $s4, $zero ## $a0 = 000007C0 -/* 00CC4 80B9BE44 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE4 -/* 00CC8 80B9BE48 46128100 */ add.s $f4, $f16, $f18 -/* 00CCC 80B9BE4C 02C03025 */ or $a2, $s6, $zero ## $a2 = FFFFFFD8 -/* 00CD0 80B9BE50 02E03825 */ or $a3, $s7, $zero ## $a3 = FFFFFFCC -/* 00CD4 80B9BE54 460AC480 */ add.s $f18, $f24, $f10 -/* 00CD8 80B9BE58 E7A400D8 */ swc1 $f4, 0x00D8($sp) -/* 00CDC 80B9BE5C C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C -/* 00CE0 80B9BE60 E7A400CC */ swc1 $f4, 0x00CC($sp) -/* 00CE4 80B9BE64 E7B200C8 */ swc1 $f18, 0x00C8($sp) -/* 00CE8 80B9BE68 46083400 */ add.s $f16, $f6, $f8 -/* 00CEC 80B9BE6C E7BC002C */ swc1 $f28, 0x002C($sp) -/* 00CF0 80B9BE70 AFB20028 */ sw $s2, 0x0028($sp) -/* 00CF4 80B9BE74 AFB80024 */ sw $t8, 0x0024($sp) -/* 00CF8 80B9BE78 4610D180 */ add.s $f6, $f26, $f16 -/* 00CFC 80B9BE7C E7B000DC */ swc1 $f16, 0x00DC($sp) -/* 00D00 80B9BE80 AFAF0020 */ sw $t7, 0x0020($sp) -/* 00D04 80B9BE84 AFA0001C */ sw $zero, 0x001C($sp) -/* 00D08 80B9BE88 E7A600D0 */ swc1 $f6, 0x00D0($sp) -/* 00D0C 80B9BE8C AFA00018 */ sw $zero, 0x0018($sp) -/* 00D10 80B9BE90 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00D14 80B9BE94 0C00F7E8 */ jal func_8003DFA0 -/* 00D18 80B9BE98 AFBE0010 */ sw $s8, 0x0010($sp) -/* 00D1C 80B9BE9C 10400003 */ beq $v0, $zero, .L80B9BEAC -/* 00D20 80B9BEA0 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 80B9CAB0 -/* 00D24 80B9BEA4 10000006 */ beq $zero, $zero, .L80B9BEC0 -/* 00D28 80B9BEA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B9BEAC: -/* 00D2C 80B9BEAC 3C1980BA */ lui $t9, %hi(D_80B9CAC8) ## $t9 = 80BA0000 -/* 00D30 80B9BEB0 2739CAC8 */ addiu $t9, $t9, %lo(D_80B9CAC8) ## $t9 = 80B9CAC8 -/* 00D34 80B9BEB4 1619FFC3 */ bne $s0, $t9, .L80B9BDC4 -/* 00D38 80B9BEB8 26310008 */ addiu $s1, $s1, 0x0008 ## $s1 = 80B9CAD0 -/* 00D3C 80B9BEBC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B9BEC0: -/* 00D40 80B9BEC0 8FBF008C */ lw $ra, 0x008C($sp) -/* 00D44 80B9BEC4 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 00D48 80B9BEC8 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 00D4C 80B9BECC D7B80048 */ ldc1 $f24, 0x0048($sp) -/* 00D50 80B9BED0 D7BA0050 */ ldc1 $f26, 0x0050($sp) -/* 00D54 80B9BED4 D7BC0058 */ ldc1 $f28, 0x0058($sp) -/* 00D58 80B9BED8 D7BE0060 */ ldc1 $f30, 0x0060($sp) -/* 00D5C 80B9BEDC 8FB00068 */ lw $s0, 0x0068($sp) -/* 00D60 80B9BEE0 8FB1006C */ lw $s1, 0x006C($sp) -/* 00D64 80B9BEE4 8FB20070 */ lw $s2, 0x0070($sp) -/* 00D68 80B9BEE8 8FB30074 */ lw $s3, 0x0074($sp) -/* 00D6C 80B9BEEC 8FB40078 */ lw $s4, 0x0078($sp) -/* 00D70 80B9BEF0 8FB5007C */ lw $s5, 0x007C($sp) -/* 00D74 80B9BEF4 8FB60080 */ lw $s6, 0x0080($sp) -/* 00D78 80B9BEF8 8FB70084 */ lw $s7, 0x0084($sp) -/* 00D7C 80B9BEFC 8FBE0088 */ lw $s8, 0x0088($sp) -/* 00D80 80B9BF00 03E00008 */ jr $ra -/* 00D84 80B9BF04 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s deleted file mode 100644 index 1e3c733539..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80B9BF08 -/* 00D88 80B9BF08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D8C 80B9BF0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D90 80B9BF10 AFA50024 */ sw $a1, 0x0024($sp) -/* 00D94 80B9BF14 0C2E6CC0 */ jal func_80B9B300 -/* 00D98 80B9BF18 AFA40020 */ sw $a0, 0x0020($sp) -/* 00D9C 80B9BF1C 1040000F */ beq $v0, $zero, .L80B9BF5C -/* 00DA0 80B9BF20 8FA70020 */ lw $a3, 0x0020($sp) -/* 00DA4 80B9BF24 944E0168 */ lhu $t6, 0x0168($v0) ## 00000168 -/* 00DA8 80B9BF28 8FA40024 */ lw $a0, 0x0024($sp) -/* 00DAC 80B9BF2C 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 -/* 00DB0 80B9BF30 51E0000B */ beql $t7, $zero, .L80B9BF60 -/* 00DB4 80B9BF34 94F80168 */ lhu $t8, 0x0168($a3) ## 00000168 -/* 00DB8 80B9BF38 84450158 */ lh $a1, 0x0158($v0) ## 00000158 -/* 00DBC 80B9BF3C 8C46017C */ lw $a2, 0x017C($v0) ## 0000017C -/* 00DC0 80B9BF40 AFA70020 */ sw $a3, 0x0020($sp) -/* 00DC4 80B9BF44 0C2E6F2E */ jal func_80B9BCB8 -/* 00DC8 80B9BF48 AFA20018 */ sw $v0, 0x0018($sp) -/* 00DCC 80B9BF4C 8FA30018 */ lw $v1, 0x0018($sp) -/* 00DD0 80B9BF50 14400002 */ bne $v0, $zero, .L80B9BF5C -/* 00DD4 80B9BF54 8FA70020 */ lw $a3, 0x0020($sp) -/* 00DD8 80B9BF58 ACE301C0 */ sw $v1, 0x01C0($a3) ## 000001C0 -.L80B9BF5C: -/* 00DDC 80B9BF5C 94F80168 */ lhu $t8, 0x0168($a3) ## 00000168 -.L80B9BF60: -/* 00DE0 80B9BF60 33190100 */ andi $t9, $t8, 0x0100 ## $t9 = 00000000 -/* 00DE4 80B9BF64 53200020 */ beql $t9, $zero, .L80B9BFE8 -/* 00DE8 80B9BF68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00DEC 80B9BF6C 8CE201C0 */ lw $v0, 0x01C0($a3) ## 000001C0 -/* 00DF0 80B9BF70 5040001D */ beql $v0, $zero, .L80B9BFE8 -/* 00DF4 80B9BF74 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00DF8 80B9BF78 94430168 */ lhu $v1, 0x0168($v0) ## 00000168 -/* 00DFC 80B9BF7C 30680010 */ andi $t0, $v1, 0x0010 ## $t0 = 00000000 -/* 00E00 80B9BF80 11000015 */ beq $t0, $zero, .L80B9BFD8 -/* 00E04 80B9BF84 30690020 */ andi $t1, $v1, 0x0020 ## $t1 = 00000000 -/* 00E08 80B9BF88 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 00E0C 80B9BF8C C4460100 */ lwc1 $f6, 0x0100($v0) ## 00000100 -/* 00E10 80B9BF90 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00E14 80B9BF94 46062201 */ sub.s $f8, $f4, $f6 -/* 00E18 80B9BF98 C4E40024 */ lwc1 $f4, 0x0024($a3) ## 00000024 -/* 00E1C 80B9BF9C E4E801C4 */ swc1 $f8, 0x01C4($a3) ## 000001C4 -/* 00E20 80B9BFA0 C4500108 */ lwc1 $f16, 0x0108($v0) ## 00000108 -/* 00E24 80B9BFA4 C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C -/* 00E28 80B9BFA8 C4E601C4 */ lwc1 $f6, 0x01C4($a3) ## 000001C4 -/* 00E2C 80B9BFAC 46105481 */ sub.s $f18, $f10, $f16 -/* 00E30 80B9BFB0 C4EA002C */ lwc1 $f10, 0x002C($a3) ## 0000002C -/* 00E34 80B9BFB4 46062200 */ add.s $f8, $f4, $f6 -/* 00E38 80B9BFB8 E4F201C8 */ swc1 $f18, 0x01C8($a3) ## 000001C8 -/* 00E3C 80B9BFBC C4F001C8 */ lwc1 $f16, 0x01C8($a3) ## 000001C8 -/* 00E40 80B9BFC0 E4E80024 */ swc1 $f8, 0x0024($a3) ## 00000024 -/* 00E44 80B9BFC4 46105480 */ add.s $f18, $f10, $f16 -/* 00E48 80B9BFC8 0C2E6CE3 */ jal func_80B9B38C -/* 00E4C 80B9BFCC E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 00E50 80B9BFD0 10000005 */ beq $zero, $zero, .L80B9BFE8 -/* 00E54 80B9BFD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B9BFD8: -/* 00E58 80B9BFD8 55200003 */ bnel $t1, $zero, .L80B9BFE8 -/* 00E5C 80B9BFDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00E60 80B9BFE0 ACE001C0 */ sw $zero, 0x01C0($a3) ## 000001C0 -/* 00E64 80B9BFE4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B9BFE8: -/* 00E68 80B9BFE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E6C 80B9BFEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E70 80B9BFF0 03E00008 */ jr $ra -/* 00E74 80B9BFF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s deleted file mode 100644 index 68accad73f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B9BFF8 -/* 00E78 80B9BFF8 AFA50004 */ sw $a1, 0x0004($sp) -/* 00E7C 80B9BFFC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E80 80B9C000 948E0168 */ lhu $t6, 0x0168($a0) ## 00000168 -/* 00E84 80B9C004 3C1880BA */ lui $t8, %hi(func_80B9C02C) ## $t8 = 80BA0000 -/* 00E88 80B9C008 2718C02C */ addiu $t8, $t8, %lo(func_80B9C02C) ## $t8 = 80B9C02C -/* 00E8C 80B9C00C 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 00E90 80B9C010 A48F0168 */ sh $t7, 0x0168($a0) ## 00000168 -/* 00E94 80B9C014 AC980164 */ sw $t8, 0x0164($a0) ## 00000164 -/* 00E98 80B9C018 E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C -/* 00E9C 80B9C01C E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 00EA0 80B9C020 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 00EA4 80B9C024 03E00008 */ jr $ra -/* 00EA8 80B9C028 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s deleted file mode 100644 index 2fc0cf5de4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s +++ /dev/null @@ -1,68 +0,0 @@ -.late_rodata -glabel D_80B9CD10 - .float 0.001 - -.text -glabel func_80B9C02C -/* 00EAC 80B9C02C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00EB0 80B9C030 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EB4 80B9C034 AFA50024 */ sw $a1, 0x0024($sp) -/* 00EB8 80B9C038 948F0168 */ lhu $t7, 0x0168($a0) ## 00000168 -/* 00EBC 80B9C03C 8499016A */ lh $t9, 0x016A($a0) ## 0000016A -/* 00EC0 80B9C040 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00EC4 80B9C044 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00EC8 80B9C048 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00ECC 80B9C04C 1F200026 */ bgtz $t9, .L80B9C0E8 -/* 00ED0 80B9C050 A4980168 */ sh $t8, 0x0168($a0) ## 00000168 -/* 00ED4 80B9C054 C4800150 */ lwc1 $f0, 0x0150($a0) ## 00000150 -/* 00ED8 80B9C058 3C0180BA */ lui $at, %hi(D_80B9CD10) ## $at = 80BA0000 -/* 00EDC 80B9C05C C424CD10 */ lwc1 $f4, %lo(D_80B9CD10)($at) -/* 00EE0 80B9C060 46000005 */ abs.s $f0, $f0 -/* 00EE4 80B9C064 4600203C */ c.lt.s $f4, $f0 -/* 00EE8 80B9C068 00000000 */ nop -/* 00EEC 80B9C06C 4502001F */ bc1fl .L80B9C0EC -/* 00EF0 80B9C070 8C6A0680 */ lw $t2, 0x0680($v1) ## 00000680 -/* 00EF4 80B9C074 AFA30018 */ sw $v1, 0x0018($sp) -/* 00EF8 80B9C078 0C2E6C95 */ jal func_80B9B254 -/* 00EFC 80B9C07C AFA70020 */ sw $a3, 0x0020($sp) -/* 00F00 80B9C080 8FA30018 */ lw $v1, 0x0018($sp) -/* 00F04 80B9C084 10400011 */ beq $v0, $zero, .L80B9C0CC -/* 00F08 80B9C088 8FA70020 */ lw $a3, 0x0020($sp) -/* 00F0C 80B9C08C 84E50158 */ lh $a1, 0x0158($a3) ## 00000158 -/* 00F10 80B9C090 8CE60150 */ lw $a2, 0x0150($a3) ## 00000150 -/* 00F14 80B9C094 AFA70020 */ sw $a3, 0x0020($sp) -/* 00F18 80B9C098 AFA30018 */ sw $v1, 0x0018($sp) -/* 00F1C 80B9C09C 0C2E6F2E */ jal func_80B9BCB8 -/* 00F20 80B9C0A0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F24 80B9C0A4 8FA30018 */ lw $v1, 0x0018($sp) -/* 00F28 80B9C0A8 14400008 */ bne $v0, $zero, .L80B9C0CC -/* 00F2C 80B9C0AC 8FA70020 */ lw $a3, 0x0020($sp) -/* 00F30 80B9C0B0 C4E60150 */ lwc1 $f6, 0x0150($a3) ## 00000150 -/* 00F34 80B9C0B4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00F38 80B9C0B8 E4E6017C */ swc1 $f6, 0x017C($a3) ## 0000017C -/* 00F3C 80B9C0BC 0C2E70D0 */ jal func_80B9C340 -/* 00F40 80B9C0C0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00F44 80B9C0C4 1000000F */ beq $zero, $zero, .L80B9C104 -/* 00F48 80B9C0C8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9C0CC: -/* 00F4C 80B9C0CC 8C680680 */ lw $t0, 0x0680($v1) ## 00000680 -/* 00F50 80B9C0D0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00F54 80B9C0D4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00F58 80B9C0D8 01014824 */ and $t1, $t0, $at -/* 00F5C 80B9C0DC AC690680 */ sw $t1, 0x0680($v1) ## 00000680 -/* 00F60 80B9C0E0 10000007 */ beq $zero, $zero, .L80B9C100 -/* 00F64 80B9C0E4 E4E80150 */ swc1 $f8, 0x0150($a3) ## 00000150 -.L80B9C0E8: -/* 00F68 80B9C0E8 8C6A0680 */ lw $t2, 0x0680($v1) ## 00000680 -.L80B9C0EC: -/* 00F6C 80B9C0EC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00F70 80B9C0F0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00F74 80B9C0F4 01415824 */ and $t3, $t2, $at -/* 00F78 80B9C0F8 AC6B0680 */ sw $t3, 0x0680($v1) ## 00000680 -/* 00F7C 80B9C0FC E4EA0150 */ swc1 $f10, 0x0150($a3) ## 00000150 -.L80B9C100: -/* 00F80 80B9C100 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9C104: -/* 00F84 80B9C104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F88 80B9C108 03E00008 */ jr $ra -/* 00F8C 80B9C10C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s deleted file mode 100644 index 0e20339d73..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B9C110 -/* 00F90 80B9C110 AFA50004 */ sw $a1, 0x0004($sp) -/* 00F94 80B9C114 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00F98 80B9C118 948E0168 */ lhu $t6, 0x0168($a0) ## 00000168 -/* 00F9C 80B9C11C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00FA0 80B9C120 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00FA4 80B9C124 3C1880BA */ lui $t8, %hi(func_80B9C14C) ## $t8 = 80BA0000 -/* 00FA8 80B9C128 2718C14C */ addiu $t8, $t8, %lo(func_80B9C14C) ## $t8 = 80B9C14C -/* 00FAC 80B9C12C 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 00FB0 80B9C130 A48F0168 */ sh $t7, 0x0168($a0) ## 00000168 -/* 00FB4 80B9C134 AC980164 */ sw $t8, 0x0164($a0) ## 00000164 -/* 00FB8 80B9C138 E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 00FBC 80B9C13C E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 00FC0 80B9C140 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 00FC4 80B9C144 03E00008 */ jr $ra -/* 00FC8 80B9C148 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s deleted file mode 100644 index c1dbf67d56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s +++ /dev/null @@ -1,144 +0,0 @@ -.late_rodata -glabel D_80B9CD14 - .float 0.001 - -.text -glabel func_80B9C14C -/* 00FCC 80B9C14C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FD0 80B9C150 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FD4 80B9C154 AFB10018 */ sw $s1, 0x0018($sp) -/* 00FD8 80B9C158 AFB00014 */ sw $s0, 0x0014($sp) -/* 00FDC 80B9C15C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00FE0 80B9C160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FE4 80B9C164 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00FE8 80B9C168 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00FEC 80B9C16C 948F0168 */ lhu $t7, 0x0168($a0) ## 00000168 -/* 00FF0 80B9C170 35F80004 */ ori $t8, $t7, 0x0004 ## $t8 = 00000004 -/* 00FF4 80B9C174 0C00B638 */ jal Actor_MoveForward - -/* 00FF8 80B9C178 A4980168 */ sh $t8, 0x0168($a0) ## 00000168 -/* 00FFC 80B9C17C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01000 80B9C180 0C2E6EF2 */ jal func_80B9BBC8 -/* 01004 80B9C184 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01008 80B9C188 5040004B */ beql $v0, $zero, .L80B9C2B8 -/* 0100C 80B9C18C 860F01BC */ lh $t7, 0x01BC($s0) ## 000001BC -/* 01010 80B9C190 861901BC */ lh $t9, 0x01BC($s0) ## 000001BC -/* 01014 80B9C194 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 01018 80B9C198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0101C 80B9C19C 00194080 */ sll $t0, $t9, 2 -/* 01020 80B9C1A0 02084821 */ addu $t1, $s0, $t0 -/* 01024 80B9C1A4 8D250180 */ lw $a1, 0x0180($t1) ## 00000180 -/* 01028 80B9C1A8 14A10005 */ bne $a1, $at, .L80B9C1C0 -/* 0102C 80B9C1AC 00000000 */ nop -/* 01030 80B9C1B0 0C2E6FFE */ jal func_80B9BFF8 -/* 01034 80B9C1B4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01038 80B9C1B8 1000005D */ beq $zero, $zero, .L80B9C330 -/* 0103C 80B9C1BC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9C1C0: -/* 01040 80B9C1C0 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 01044 80B9C1C4 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 01048 80B9C1C8 10400035 */ beq $v0, $zero, .L80B9C2A0 -/* 0104C 80B9C1CC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01050 80B9C1D0 0C010D2A */ jal func_800434A8 -/* 01054 80B9C1D4 AFA20024 */ sw $v0, 0x0024($sp) -/* 01058 80B9C1D8 0C010D4E */ jal func_80043538 -/* 0105C 80B9C1DC 8FA40024 */ lw $a0, 0x0024($sp) -/* 01060 80B9C1E0 860A016A */ lh $t2, 0x016A($s0) ## 0000016A -/* 01064 80B9C1E4 8FA20028 */ lw $v0, 0x0028($sp) -/* 01068 80B9C1E8 5D400027 */ bgtzl $t2, .L80B9C288 -/* 0106C 80B9C1EC 8C4D0680 */ lw $t5, 0x0680($v0) ## 00000680 -/* 01070 80B9C1F0 C6000150 */ lwc1 $f0, 0x0150($s0) ## 00000150 -/* 01074 80B9C1F4 3C0180BA */ lui $at, %hi(D_80B9CD14) ## $at = 80BA0000 -/* 01078 80B9C1F8 C424CD14 */ lwc1 $f4, %lo(D_80B9CD14)($at) -/* 0107C 80B9C1FC 46000005 */ abs.s $f0, $f0 -/* 01080 80B9C200 4600203C */ c.lt.s $f4, $f0 -/* 01084 80B9C204 00000000 */ nop -/* 01088 80B9C208 4502001F */ bc1fl .L80B9C288 -/* 0108C 80B9C20C 8C4D0680 */ lw $t5, 0x0680($v0) ## 00000680 -/* 01090 80B9C210 0C2E6C95 */ jal func_80B9B254 -/* 01094 80B9C214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01098 80B9C218 10400012 */ beq $v0, $zero, .L80B9C264 -/* 0109C 80B9C21C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010A0 80B9C220 8FA50024 */ lw $a1, 0x0024($sp) -/* 010A4 80B9C224 0C2E6D2F */ jal func_80B9B4BC -/* 010A8 80B9C228 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 010AC 80B9C22C 1040000D */ beq $v0, $zero, .L80B9C264 -/* 010B0 80B9C230 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010B4 80B9C234 86050158 */ lh $a1, 0x0158($s0) ## 00000158 -/* 010B8 80B9C238 8E060150 */ lw $a2, 0x0150($s0) ## 00000150 -/* 010BC 80B9C23C 0C2E6F2E */ jal func_80B9BCB8 -/* 010C0 80B9C240 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 010C4 80B9C244 14400007 */ bne $v0, $zero, .L80B9C264 -/* 010C8 80B9C248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010CC 80B9C24C C6060150 */ lwc1 $f6, 0x0150($s0) ## 00000150 -/* 010D0 80B9C250 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 010D4 80B9C254 0C2E70D0 */ jal func_80B9C340 -/* 010D8 80B9C258 E606017C */ swc1 $f6, 0x017C($s0) ## 0000017C -/* 010DC 80B9C25C 10000034 */ beq $zero, $zero, .L80B9C330 -/* 010E0 80B9C260 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9C264: -/* 010E4 80B9C264 8FA20028 */ lw $v0, 0x0028($sp) -/* 010E8 80B9C268 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 010EC 80B9C26C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 010F0 80B9C270 8C4B0680 */ lw $t3, 0x0680($v0) ## 00000680 -/* 010F4 80B9C274 01616024 */ and $t4, $t3, $at -/* 010F8 80B9C278 AC4C0680 */ sw $t4, 0x0680($v0) ## 00000680 -/* 010FC 80B9C27C 1000002B */ beq $zero, $zero, .L80B9C32C -/* 01100 80B9C280 E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 -/* 01104 80B9C284 8C4D0680 */ lw $t5, 0x0680($v0) ## 00000680 -.L80B9C288: -/* 01108 80B9C288 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 0110C 80B9C28C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01110 80B9C290 01A17024 */ and $t6, $t5, $at -/* 01114 80B9C294 AC4E0680 */ sw $t6, 0x0680($v0) ## 00000680 -/* 01118 80B9C298 10000024 */ beq $zero, $zero, .L80B9C32C -/* 0111C 80B9C29C E60A0150 */ swc1 $f10, 0x0150($s0) ## 00000150 -.L80B9C2A0: -/* 01120 80B9C2A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01124 80B9C2A4 0C2E6FFE */ jal func_80B9BFF8 -/* 01128 80B9C2A8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0112C 80B9C2AC 10000020 */ beq $zero, $zero, .L80B9C330 -/* 01130 80B9C2B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01134 80B9C2B4 860F01BC */ lh $t7, 0x01BC($s0) ## 000001BC -.L80B9C2B8: -/* 01138 80B9C2B8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0113C 80B9C2BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01140 80B9C2C0 000FC080 */ sll $t8, $t7, 2 -/* 01144 80B9C2C4 0218C821 */ addu $t9, $s0, $t8 -/* 01148 80B9C2C8 8F250180 */ lw $a1, 0x0180($t9) ## 00000180 -/* 0114C 80B9C2CC 14A10005 */ bne $a1, $at, .L80B9C2E4 -/* 01150 80B9C2D0 00000000 */ nop -/* 01154 80B9C2D4 0C2E7161 */ jal func_80B9C584 -/* 01158 80B9C2D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0115C 80B9C2DC 10000014 */ beq $zero, $zero, .L80B9C330 -/* 01160 80B9C2E0 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9C2E4: -/* 01164 80B9C2E4 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 01168 80B9C2E8 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 0116C 80B9C2EC 1040000C */ beq $v0, $zero, .L80B9C320 -/* 01170 80B9C2F0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01174 80B9C2F4 8C48015C */ lw $t0, 0x015C($v0) ## 0000015C -/* 01178 80B9C2F8 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 0117C 80B9C2FC 51200009 */ beql $t1, $zero, .L80B9C324 -/* 01180 80B9C300 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01184 80B9C304 0C010D2A */ jal func_800434A8 -/* 01188 80B9C308 AFA20024 */ sw $v0, 0x0024($sp) -/* 0118C 80B9C30C 0C010D4E */ jal func_80043538 -/* 01190 80B9C310 8FA40024 */ lw $a0, 0x0024($sp) -/* 01194 80B9C314 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 01198 80B9C318 10000004 */ beq $zero, $zero, .L80B9C32C -/* 0119C 80B9C31C E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -.L80B9C320: -/* 011A0 80B9C320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9C324: -/* 011A4 80B9C324 0C2E7161 */ jal func_80B9C584 -/* 011A8 80B9C328 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80B9C32C: -/* 011AC 80B9C32C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9C330: -/* 011B0 80B9C330 8FB00014 */ lw $s0, 0x0014($sp) -/* 011B4 80B9C334 8FB10018 */ lw $s1, 0x0018($sp) -/* 011B8 80B9C338 03E00008 */ jr $ra -/* 011BC 80B9C33C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s deleted file mode 100644 index 16fab40936..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B9C340 -/* 011C0 80B9C340 AFA50004 */ sw $a1, 0x0004($sp) -/* 011C4 80B9C344 948E0168 */ lhu $t6, 0x0168($a0) ## 00000168 -/* 011C8 80B9C348 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 011CC 80B9C34C 3C1880BA */ lui $t8, %hi(func_80B9C368) ## $t8 = 80BA0000 -/* 011D0 80B9C350 2718C368 */ addiu $t8, $t8, %lo(func_80B9C368) ## $t8 = 80B9C368 -/* 011D4 80B9C354 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 011D8 80B9C358 A48F0168 */ sh $t7, 0x0168($a0) ## 00000168 -/* 011DC 80B9C35C AC980164 */ sw $t8, 0x0164($a0) ## 00000164 -/* 011E0 80B9C360 03E00008 */ jr $ra -/* 011E4 80B9C364 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s deleted file mode 100644 index 21f0ae7393..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s +++ /dev/null @@ -1,147 +0,0 @@ -glabel func_80B9C368 -/* 011E8 80B9C368 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 011EC 80B9C36C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 011F0 80B9C370 44811000 */ mtc1 $at, $f2 ## $f2 = 2.00 -/* 011F4 80B9C374 AFBF001C */ sw $ra, 0x001C($sp) -/* 011F8 80B9C378 AFB10018 */ sw $s1, 0x0018($sp) -/* 011FC 80B9C37C AFB00014 */ sw $s0, 0x0014($sp) -/* 01200 80B9C380 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01204 80B9C384 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01208 80B9C388 C4840174 */ lwc1 $f4, 0x0174($a0) ## 00000174 -/* 0120C 80B9C38C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01210 80B9C390 948E0168 */ lhu $t6, 0x0168($a0) ## 00000168 -/* 01214 80B9C394 46062200 */ add.s $f8, $f4, $f6 -/* 01218 80B9C398 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0121C 80B9C39C 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 01220 80B9C3A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01224 80B9C3A4 E4880174 */ swc1 $f8, 0x0174($a0) ## 00000174 -/* 01228 80B9C3A8 C4800174 */ lwc1 $f0, 0x0174($a0) ## 00000174 -/* 0122C 80B9C3AC A48F0168 */ sh $t7, 0x0168($a0) ## 00000168 -/* 01230 80B9C3B0 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 01234 80B9C3B4 4600103C */ c.lt.s $f2, $f0 -/* 01238 80B9C3B8 00000000 */ nop -/* 0123C 80B9C3BC 45020004 */ bc1fl .L80B9C3D0 -/* 01240 80B9C3C0 E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -/* 01244 80B9C3C4 10000002 */ beq $zero, $zero, .L80B9C3D0 -/* 01248 80B9C3C8 E4820174 */ swc1 $f2, 0x0174($a0) ## 00000174 -/* 0124C 80B9C3CC E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -.L80B9C3D0: -/* 01250 80B9C3D0 8E060174 */ lw $a2, 0x0174($s0) ## 00000174 -/* 01254 80B9C3D4 AFA30028 */ sw $v1, 0x0028($sp) -/* 01258 80B9C3D8 0C01DE80 */ jal Math_ApproxF - -/* 0125C 80B9C3DC 26040178 */ addiu $a0, $s0, 0x0178 ## $a0 = 00000178 -/* 01260 80B9C3E0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 01264 80B9C3E4 C60A017C */ lwc1 $f10, 0x017C($s0) ## 0000017C -/* 01268 80B9C3E8 8FA30028 */ lw $v1, 0x0028($sp) -/* 0126C 80B9C3EC 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 01270 80B9C3F0 460A603E */ c.le.s $f12, $f10 -/* 01274 80B9C3F4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01278 80B9C3F8 45020006 */ bc1fl .L80B9C414 -/* 0127C 80B9C3FC 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 -/* 01280 80B9C400 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01284 80B9C404 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 01288 80B9C408 10000004 */ beq $zero, $zero, .L80B9C41C -/* 0128C 80B9C40C C6100178 */ lwc1 $f16, 0x0178($s0) ## 00000178 -/* 01290 80B9C410 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -.L80B9C414: -/* 01294 80B9C414 00000000 */ nop -/* 01298 80B9C418 C6100178 */ lwc1 $f16, 0x0178($s0) ## 00000178 -.L80B9C41C: -/* 0129C 80B9C41C C604016C */ lwc1 $f4, 0x016C($s0) ## 0000016C -/* 012A0 80B9C420 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 -/* 012A4 80B9C424 46101002 */ mul.s $f0, $f2, $f16 -/* 012A8 80B9C428 C6100170 */ lwc1 $f16, 0x0170($s0) ## 00000170 -/* 012AC 80B9C42C C60A0010 */ lwc1 $f10, 0x0010($s0) ## 00000010 -/* 012B0 80B9C430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012B4 80B9C434 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 012B8 80B9C438 46040182 */ mul.s $f6, $f0, $f4 -/* 012BC 80B9C43C 00000000 */ nop -/* 012C0 80B9C440 46100102 */ mul.s $f4, $f0, $f16 -/* 012C4 80B9C444 46069200 */ add.s $f8, $f18, $f6 -/* 012C8 80B9C448 46045480 */ add.s $f18, $f10, $f4 -/* 012CC 80B9C44C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 012D0 80B9C450 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 012D4 80B9C454 AFA60020 */ sw $a2, 0x0020($sp) -/* 012D8 80B9C458 0C2E6EF2 */ jal func_80B9BBC8 -/* 012DC 80B9C45C AFA30028 */ sw $v1, 0x0028($sp) -/* 012E0 80B9C460 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 012E4 80B9C464 8FA30028 */ lw $v1, 0x0028($sp) -/* 012E8 80B9C468 14400011 */ bne $v0, $zero, .L80B9C4B0 -/* 012EC 80B9C46C 8FA60020 */ lw $a2, 0x0020($sp) -/* 012F0 80B9C470 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 012F4 80B9C474 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 012F8 80B9C478 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 012FC 80B9C47C E6060008 */ swc1 $f6, 0x0008($s0) ## 00000008 -/* 01300 80B9C480 E6080010 */ swc1 $f8, 0x0010($s0) ## 00000010 -/* 01304 80B9C484 8C780680 */ lw $t8, 0x0680($v1) ## 00000680 -/* 01308 80B9C488 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0130C 80B9C48C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01310 80B9C490 0301C824 */ and $t9, $t8, $at -/* 01314 80B9C494 AC790680 */ sw $t9, 0x0680($v1) ## 00000680 -/* 01318 80B9C498 E60C0150 */ swc1 $f12, 0x0150($s0) ## 00000150 -/* 0131C 80B9C49C E60C0178 */ swc1 $f12, 0x0178($s0) ## 00000178 -/* 01320 80B9C4A0 0C2E7161 */ jal func_80B9C584 -/* 01324 80B9C4A4 E60C0174 */ swc1 $f12, 0x0174($s0) ## 00000174 -/* 01328 80B9C4A8 1000002F */ beq $zero, $zero, .L80B9C568 -/* 0132C 80B9C4AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9C4B0: -/* 01330 80B9C4B0 10C0002C */ beq $a2, $zero, .L80B9C564 -/* 01334 80B9C4B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01338 80B9C4B8 8E231C44 */ lw $v1, 0x1C44($s1) ## 00001C44 -/* 0133C 80B9C4BC 86050158 */ lh $a1, 0x0158($s0) ## 00000158 -/* 01340 80B9C4C0 8E060150 */ lw $a2, 0x0150($s0) ## 00000150 -/* 01344 80B9C4C4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 01348 80B9C4C8 0C2E6F2E */ jal func_80B9BCB8 -/* 0134C 80B9C4CC AFA30028 */ sw $v1, 0x0028($sp) -/* 01350 80B9C4D0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 01354 80B9C4D4 10400007 */ beq $v0, $zero, .L80B9C4F4 -/* 01358 80B9C4D8 8FA30028 */ lw $v1, 0x0028($sp) -/* 0135C 80B9C4DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01360 80B9C4E0 24052835 */ addiu $a1, $zero, 0x2835 ## $a1 = 00002835 -/* 01364 80B9C4E4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01368 80B9C4E8 AFA30028 */ sw $v1, 0x0028($sp) -/* 0136C 80B9C4EC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 01370 80B9C4F0 8FA30028 */ lw $v1, 0x0028($sp) -.L80B9C4F4: -/* 01374 80B9C4F4 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 01378 80B9C4F8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 0137C 80B9C4FC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 01380 80B9C500 E6100008 */ swc1 $f16, 0x0008($s0) ## 00000008 -/* 01384 80B9C504 E60A0010 */ swc1 $f10, 0x0010($s0) ## 00000010 -/* 01388 80B9C508 8C680680 */ lw $t0, 0x0680($v1) ## 00000680 -/* 0138C 80B9C50C 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 01390 80B9C510 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01394 80B9C514 01014824 */ and $t1, $t0, $at -/* 01398 80B9C518 AC690680 */ sw $t1, 0x0680($v1) ## 00000680 -/* 0139C 80B9C51C 860B01BC */ lh $t3, 0x01BC($s0) ## 000001BC -/* 013A0 80B9C520 E60C0150 */ swc1 $f12, 0x0150($s0) ## 00000150 -/* 013A4 80B9C524 E60C0178 */ swc1 $f12, 0x0178($s0) ## 00000178 -/* 013A8 80B9C528 000B6080 */ sll $t4, $t3, 2 -/* 013AC 80B9C52C E60C0174 */ swc1 $f12, 0x0174($s0) ## 00000174 -/* 013B0 80B9C530 A60A016A */ sh $t2, 0x016A($s0) ## 0000016A -/* 013B4 80B9C534 020C6821 */ addu $t5, $s0, $t4 -/* 013B8 80B9C538 8DAE0180 */ lw $t6, 0x0180($t5) ## 00000180 -/* 013BC 80B9C53C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 013C0 80B9C540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C4 80B9C544 15C10005 */ bne $t6, $at, .L80B9C55C -/* 013C8 80B9C548 00000000 */ nop -/* 013CC 80B9C54C 0C2E6FFE */ jal func_80B9BFF8 -/* 013D0 80B9C550 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D4 80B9C554 10000004 */ beq $zero, $zero, .L80B9C568 -/* 013D8 80B9C558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9C55C: -/* 013DC 80B9C55C 0C2E7044 */ jal func_80B9C110 -/* 013E0 80B9C560 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80B9C564: -/* 013E4 80B9C564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9C568: -/* 013E8 80B9C568 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 013EC 80B9C56C 2405200A */ addiu $a1, $zero, 0x200A ## $a1 = 0000200A -/* 013F0 80B9C570 8FBF001C */ lw $ra, 0x001C($sp) -/* 013F4 80B9C574 8FB00014 */ lw $s0, 0x0014($sp) -/* 013F8 80B9C578 8FB10018 */ lw $s1, 0x0018($sp) -/* 013FC 80B9C57C 03E00008 */ jr $ra -/* 01400 80B9C580 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s deleted file mode 100644 index 8d58f67eb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B9C584 -/* 01404 80B9C584 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01408 80B9C588 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0140C 80B9C58C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01410 80B9C590 948E0168 */ lhu $t6, 0x0168($a0) ## 00000168 -/* 01414 80B9C594 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01418 80B9C598 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 0141C 80B9C59C 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 -/* 01420 80B9C5A0 A48F0168 */ sh $t7, 0x0168($a0) ## 00000168 -/* 01424 80B9C5A4 E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 01428 80B9C5A8 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 0142C 80B9C5AC E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 01430 80B9C5B0 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 01434 80B9C5B4 0C2E6EDC */ jal func_80B9BB70 -/* 01438 80B9C5B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0143C 80B9C5BC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01440 80B9C5C0 3C1880BA */ lui $t8, %hi(func_80B9C5DC) ## $t8 = 80BA0000 -/* 01444 80B9C5C4 2718C5DC */ addiu $t8, $t8, %lo(func_80B9C5DC) ## $t8 = 80B9C5DC -/* 01448 80B9C5C8 AC980164 */ sw $t8, 0x0164($a0) ## 00000164 -/* 0144C 80B9C5CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01450 80B9C5D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01454 80B9C5D4 03E00008 */ jr $ra -/* 01458 80B9C5D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s deleted file mode 100644 index 0dba58a60d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80B9CD18 - .float 0.001 - -.text -glabel func_80B9C5DC -/* 0145C 80B9C5DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01460 80B9C5E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01464 80B9C5E4 AFB10018 */ sw $s1, 0x0018($sp) -/* 01468 80B9C5E8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0146C 80B9C5EC 948E0168 */ lhu $t6, 0x0168($a0) ## 00000168 -/* 01470 80B9C5F0 C4800150 */ lwc1 $f0, 0x0150($a0) ## 00000150 -/* 01474 80B9C5F4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01478 80B9C5F8 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 0147C 80B9C5FC A48F0168 */ sh $t7, 0x0168($a0) ## 00000168 -/* 01480 80B9C600 3C0180BA */ lui $at, %hi(D_80B9CD18) ## $at = 80BA0000 -/* 01484 80B9C604 C424CD18 */ lwc1 $f4, %lo(D_80B9CD18)($at) -/* 01488 80B9C608 46000005 */ abs.s $f0, $f0 -/* 0148C 80B9C60C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01490 80B9C610 4600203C */ c.lt.s $f4, $f0 -/* 01494 80B9C614 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01498 80B9C618 45000007 */ bc1f .L80B9C638 -/* 0149C 80B9C61C 00000000 */ nop -/* 014A0 80B9C620 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 014A4 80B9C624 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 014A8 80B9C628 E4860150 */ swc1 $f6, 0x0150($a0) ## 00000150 -/* 014AC 80B9C62C 8C580680 */ lw $t8, 0x0680($v0) ## 00000680 -/* 014B0 80B9C630 0301C824 */ and $t9, $t8, $at -/* 014B4 80B9C634 AC590680 */ sw $t9, 0x0680($v0) ## 00000680 -.L80B9C638: -/* 014B8 80B9C638 0C00B638 */ jal Actor_MoveForward - -/* 014BC 80B9C63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C0 80B9C640 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C4 80B9C644 0C2E6F08 */ jal func_80B9BC20 -/* 014C8 80B9C648 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014CC 80B9C64C 5040001F */ beql $v0, $zero, .L80B9C6CC -/* 014D0 80B9C650 8FBF001C */ lw $ra, 0x001C($sp) -/* 014D4 80B9C654 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC -/* 014D8 80B9C658 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 014DC 80B9C65C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014E0 80B9C660 00084880 */ sll $t1, $t0, 2 -/* 014E4 80B9C664 02095021 */ addu $t2, $s0, $t1 -/* 014E8 80B9C668 8D4B0180 */ lw $t3, 0x0180($t2) ## 00000180 -/* 014EC 80B9C66C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014F0 80B9C670 15610005 */ bne $t3, $at, .L80B9C688 -/* 014F4 80B9C674 00000000 */ nop -/* 014F8 80B9C678 0C2E6FFE */ jal func_80B9BFF8 -/* 014FC 80B9C67C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01500 80B9C680 10000004 */ beq $zero, $zero, .L80B9C694 -/* 01504 80B9C684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9C688: -/* 01508 80B9C688 0C2E7044 */ jal func_80B9C110 -/* 0150C 80B9C68C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01510 80B9C690 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9C694: -/* 01514 80B9C694 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01518 80B9C698 24052835 */ addiu $a1, $zero, 0x2835 ## $a1 = 00002835 -/* 0151C 80B9C69C 860C01BC */ lh $t4, 0x01BC($s0) ## 000001BC -/* 01520 80B9C6A0 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 01524 80B9C6A4 000C6880 */ sll $t5, $t4, 2 -/* 01528 80B9C6A8 020D1021 */ addu $v0, $s0, $t5 -/* 0152C 80B9C6AC 8C450194 */ lw $a1, 0x0194($v0) ## 00000194 -/* 01530 80B9C6B0 0C0107CD */ jal func_80041F34 -/* 01534 80B9C6B4 8C460180 */ lw $a2, 0x0180($v0) ## 00000180 -/* 01538 80B9C6B8 24450800 */ addiu $a1, $v0, 0x0800 ## $a1 = 00000800 -/* 0153C 80B9C6BC 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000800 -/* 01540 80B9C6C0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01544 80B9C6C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01548 80B9C6C8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9C6CC: -/* 0154C 80B9C6CC 8FB00014 */ lw $s0, 0x0014($sp) -/* 01550 80B9C6D0 8FB10018 */ lw $s1, 0x0018($sp) -/* 01554 80B9C6D4 03E00008 */ jr $ra -/* 01558 80B9C6D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s index 4a28e2aa2a..ac99398c46 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s @@ -320,7 +320,7 @@ glabel Player_Init /* 14F4C 8084715C 3C078085 */ lui $a3, %hi(D_80854778) ## $a3 = 80850000 /* 14F50 80847160 24E74778 */ addiu $a3, $a3, %lo(D_80854778) ## $a3 = 80854778 /* 14F54 80847164 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 14F58 80847168 0C20E5A0 */ jal func_80839680 +/* 14F58 80847168 0C20E5A0 */ jal Player_SpawnFairy /* 14F5C 8084716C AFA00010 */ sw $zero, 0x0010($sp) /* 14F60 80847170 AE02068C */ sw $v0, 0x068C($s0) ## 0000068C /* 14F64 80847174 864313C4 */ lh $v1, 0x13C4($s2) ## 8015FA24 diff --git a/data/code_800F7260.data.s b/data/code_800F7260.data.s deleted file mode 100644 index 9828691dd4..0000000000 --- a/data/code_800F7260.data.s +++ /dev/null @@ -1,64 +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_80133340 - .incbin "baserom.z64", 0xBAA4E0, 0x4 - -glabel D_80133344 - .incbin "baserom.z64", 0xBAA4E4, 0x4C - -glabel D_80133390 - .incbin "baserom.z64", 0xBAA530, 0x8 - -glabel D_80133398 - .incbin "baserom.z64", 0xBAA538, 0x8 - -glabel D_801333A0 - .incbin "baserom.z64", 0xBAA540, 0x4 - -glabel D_801333A4 - .incbin "baserom.z64", 0xBAA544, 0x4 - -glabel D_801333A8 - .word D_8016BAD0 - .word D_8016BC80 - .word D_8016BEC0 - .word D_8016C2E0 - .word D_8016C6A0 - .word D_8016C820 - .word D_8016C8B0 - -glabel D_801333C4 - .incbin "baserom.z64", 0xBAA564, 0x8 - -glabel D_801333CC - .incbin "baserom.z64", 0xBAA56C, 0x4 - -glabel D_801333D0 - .incbin "baserom.z64", 0xBAA570, 0x4 - -glabel D_801333D4 - .incbin "baserom.z64", 0xBAA574, 0xC - -glabel D_801333E0 - .incbin "baserom.z64", 0xBAA580, 0x8 - -glabel D_801333E8 - .incbin "baserom.z64", 0xBAA588, 0x8 - -glabel D_801333F0 - .incbin "baserom.z64", 0xBAA590, 0x4 - -glabel D_801333F4 - .incbin "baserom.z64", 0xBAA594, 0x4 - -glabel D_801333F8 - .incbin "baserom.z64", 0xBAA598, 0x8 diff --git a/data/overlays/actors/z_bg_hidan_fwbig.data.s b/data/overlays/actors/z_bg_hidan_fwbig.data.s deleted file mode 100644 index aba00708e5..0000000000 --- a/data/overlays/actors/z_bg_hidan_fwbig.data.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Hidan_Fwbig_InitVars - .word 0x008D0600, 0x00000010, 0x002C0000, 0x000001A0 -.word BgHidanFwbig_Init -.word BgHidanFwbig_Destroy -.word BgHidanFwbig_Update -.word BgHidanFwbig_Draw -glabel D_80887ED0 - .word 0x0A110009, 0x20010000, 0x00000000, 0x20000000, 0x01040000, 0xFFCFFFFF, 0x00000000, 0x19000100, 0x001E0082, 0x00000000, 0x00000000 -glabel D_80887EFC - .word 0x30F803E8 - diff --git a/data/overlays/actors/z_bg_hidan_fwbig.reloc.s b/data/overlays/actors/z_bg_hidan_fwbig.reloc.s deleted file mode 100644 index c728a380f1..0000000000 --- a/data/overlays/actors/z_bg_hidan_fwbig.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_80887F60 - .incbin "baserom/ovl_Bg_Hidan_Fwbig", 0xC70, 0x000000E0 diff --git a/data/overlays/actors/z_bg_jya_bombchuiwa.data.s b/data/overlays/actors/z_bg_jya_bombchuiwa.data.s deleted file mode 100644 index 6af07457d1..0000000000 --- a/data/overlays/actors/z_bg_jya_bombchuiwa.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Jya_Bombchuiwa_InitVars - .word 0x01590100, 0x00000001, 0x00F10000, 0x000001B8 -.word BgJyaBombchuiwa_Init -.word BgJyaBombchuiwa_Destroy -.word BgJyaBombchuiwa_Update -.word BgJyaBombchuiwa_Draw -glabel D_80894F40 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010100, 0x0000FED4, 0x00000000, 0x00280064 -glabel D_80894F64 - .word 0x0A000921, 0x20000000, 0x00000001 -.word D_80894F40 -glabel D_80894F74 - .word 0x801F0003, 0xC8500064, 0xB0F403E8, 0xB0F803E8, 0x30FC03E8 -glabel D_80894F88 - .word 0xC4660000 -glabel D_80894F8C - .word 0x43F00000 -glabel D_80894F90 - .word 0xC45E4000 -glabel D_80894F94 - .word 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.s b/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.s deleted file mode 100644 index 559ab95818..0000000000 --- a/data/overlays/actors/z_bg_jya_bombchuiwa.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_808950B0 - .incbin "baserom/ovl_Bg_Jya_Bombchuiwa", 0xC10, 0x000000F0 diff --git a/data/overlays/actors/z_bg_spot11_oasis.data.s b/data/overlays/actors/z_bg_spot11_oasis.data.s deleted file mode 100644 index feb404c96c..0000000000 --- a/data/overlays/actors/z_bg_spot11_oasis.data.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Spot11_Oasis_InitVars - .word 0x01C20100, 0x00000010, 0x016F0000, 0x00000154 -.word BgSpot11Oasis_Init -.word Actor_Noop -.word BgSpot11Oasis_Update -.word 0x00000000 -glabel D_808B2E10 - .word 0x04EC07F8 -glabel D_808B2E14 - .word 0x04EB079B, 0x046F0744, 0x043F0778 -glabel D_808B2E20 - .word 0x049507FC -glabel D_808B2E24 - .word 0xC0500001, 0xB0F40BB8, 0xB0F804B0, 0x30FC03E8 -glabel D_808B2E34 - .word 0x00000000, 0xC2C80000, 0x00000000, 0x42C80000, 0xC2A00000, 0xC2480000, 0xC2480000, 0xC2A00000, 0xC2C80000, 0xC2960000, 0xC2B40000, 0x42B40000, 0x41F00000, 0xC2C80000, 0x42200000 - diff --git a/data/overlays/actors/z_bg_spot11_oasis.reloc.s b/data/overlays/actors/z_bg_spot11_oasis.reloc.s deleted file mode 100644 index fe759a6d7d..0000000000 --- a/data/overlays/actors/z_bg_spot11_oasis.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_808B2ED0 - .incbin "baserom/ovl_Bg_Spot11_Oasis", 0x6E0, 0x000000C0 diff --git a/data/overlays/actors/z_en_elf.data.s b/data/overlays/actors/z_en_elf.data.s deleted file mode 100644 index 12a7c7cc5e..0000000000 --- a/data/overlays/actors/z_en_elf.data.s +++ /dev/null @@ -1,32 +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 En_Elf_InitVars - .word 0x00180700, 0x02000030, 0x00010000, 0x000002D0 -.word EnElf_Init -.word EnElf_Destroy -.word EnElf_Update -.word EnElf_Draw -glabel D_80A06020 - .word 0x48500008 -glabel D_80A06024 - .word 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x435C0000, 0x435C0000, 0x437F0000 -glabel D_80A06044 - .word 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x42480000, 0x42C80000, 0x437F0000 -glabel D_80A06064 - .word 0x00000001, 0x00000102, 0x00010002, 0x00010002, 0x01000001, 0x02000001, 0x02000100, 0x02010101, 0x00010001, 0x00010100 -glabel D_80A0608C - .word 0x00000000, 0xBD4CCCCD, 0x00000000 -glabel D_80A06098 - .word 0x00000000, 0xBCCCCCCD, 0x00000000 -glabel D_80A060A4 - .word 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_niw.data.s b/data/overlays/actors/z_en_niw.data.s deleted file mode 100644 index 9f0af35112..0000000000 --- a/data/overlays/actors/z_en_niw.data.s +++ /dev/null @@ -1,48 +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_80AB85E0 - .word 0x00000000 -glabel En_Niw_InitVars - .word 0x00190600, 0x00800010, 0x00130000, 0x000007B8 -.word EnNiw_Init -.word EnNiw_Destroy -.word EnNiw_Update -.word EnNiw_Draw -glabel D_80AB8604 - .word 0x459C4000, 0xC59C4000 -glabel D_80AB860C - .word 0x459C4000 -glabel D_80AB8610 - .word 0x453B8000, 0x457A0000 -glabel D_80AB8618 - .word 0xC4D42000, 0x42A00000, 0x44598000, 0x42640000, 0x43A00000, 0xC4284000, 0x44470000, 0x42A00000, 0x44CCE000, 0x44B12000, 0x43E88000, 0x43290000, 0xC2700000, 0x00000000, 0xC2380000, 0xC3770000, 0x42A00000, 0x44558000, 0x4486E000, 0x42A00000, 0xC23C0000 -glabel D_80AB866C - .word 0x02000400, 0x08001000, 0x20004000, 0x80000000 -glabel D_80AB867C - .word 0x00000000 -glabel D_80AB8680 - .word 0x00000000 -glabel D_80AB8684 - .word 0x05000901, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x000F0019, 0x00040000, 0x00000000 -glabel D_80AB86B0 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x000F0019, 0x00040000, 0x00000000 -glabel D_80AB86DC - .word 0x801F0006, 0xB86CF830, 0x304C0000 -glabel D_80AB86E8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AB86F4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AB8700 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AB870C - .word 0x3E19999A, 0x3E19999A, 0x3E19999A, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_niw.reloc.s b/data/overlays/actors/z_en_niw.reloc.s deleted file mode 100644 index 2146bab749..0000000000 --- a/data/overlays/actors/z_en_niw.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_80AB8B20 - .incbin "baserom/ovl_En_Niw", 0x33A0, 0x00000460 diff --git a/data/overlays/actors/z_obj_oshihiki.data.s b/data/overlays/actors/z_obj_oshihiki.data.s deleted file mode 100644 index f58d816d9d..0000000000 --- a/data/overlays/actors/z_obj_oshihiki.data.s +++ /dev/null @@ -1,32 +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 Obj_Oshihiki_InitVars - .word 0x00FF0600, 0x00000010, 0x00030000, 0x000001D4 -.word ObjOshihiki_Init -.word ObjOshihiki_Destroy -.word ObjOshihiki_Update -.word ObjOshihiki_Draw -glabel D_80B9C9C0 - .word 0x3DCCCCCD, 0x3E2AAAAB, 0x3E4CCCCD, 0x3EAAAAAB, 0x3DCCCCCD, 0x3E2AAAAB, 0x3E4CCCCD, 0x3EAAAAAB -glabel D_80B9C9E0 - .word 0x6E56286E, 0x56286E56, 0x286E5628, 0x6A786E68, 0x50140000, 0x00000000, 0x8E635648, 0x76600000, 0x00000000, 0xD29650D2, 0xAA500000, 0x00000000, 0x6690B6B0, 0xA76464A7, 0x64756160, 0xE8D2B0E8, 0xD2B0E8D2, 0xB0E8D2B0, 0x877D5F87, 0x7D5F877D, 0x5F877D5F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xE8D2B0E8, 0xD2B0E8D2, 0xB0E8D2B0 -glabel D_80B9CA4C - .word 0x00000001, 0x00030004, 0x00050006, 0x0007000A, 0x000B0000 -glabel D_80B9CA60 - .word 0xB0F40708, 0xB0F801F4, 0x30FC05DC -glabel D_80B9CA6C - .word 0x41EFEB85, 0x3F8147AE, 0xC1EFEB85, 0xC1EFEB85, 0x3F8147AE, 0xC1EFEB85, 0xC1EFEB85, 0x3F8147AE, 0x41EFEB85, 0x41EFEB85, 0x3F8147AE, 0x41EFEB85, 0x00000000, 0x3F8147AE, 0x00000000 -glabel D_80B9CAA8 - .word 0xC1F00000, 0x00000000, 0x41F00000, 0x00000000, 0xC1F00000, 0x42700000, 0x41F00000, 0x42700000 -glabel D_80B9CAC8 - .word 0x3F800000, 0x3F800000, 0xBF800000, 0x3F800000, 0x3F800000, 0xBF800000, 0xBF800000, 0xBF800000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_obj_oshihiki.reloc.s b/data/overlays/actors/z_obj_oshihiki.reloc.s deleted file mode 100644 index 18565daf4a..0000000000 --- a/data/overlays/actors/z_obj_oshihiki.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_80B9CD50 - .incbin "baserom/ovl_Obj_Oshihiki", 0x1BD0, 0x00000280 diff --git a/include/functions.h b/include/functions.h index 8aac5dc8df..f67c3ec8f0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -581,7 +581,8 @@ f32 func_8003C890(CollisionContext*, CollisionPoly**, Vec3f*); f32 func_8003C8EC(GlobalContext*, CollisionContext*, CollisionPoly**, Vec3f*); f32 func_8003C940(CollisionContext*, CollisionPoly**, s32*, Vec3f*); f32 func_8003C9A4(CollisionContext*, CollisionPoly**, UNK_PTR, Actor*, Vec3f*); -f32 func_8003CA0C(GlobalContext*, CollisionContext*, CollisionPoly**, u32*, Actor*, Vec3f*); +f32 func_8003CA0C(GlobalContext* globalCtx, CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, + Vec3f* pos); f32 func_8003CA64(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos, f32 chkDist); f32 func_8003CB30(CollisionContext*, CollisionPoly*, Vec3f*, MtxF*); f32 func_8003CCA4(CollisionContext*, CollisionPoly**, s32*, Vec3f*); @@ -597,7 +598,7 @@ s32 func_8003D7A0(CollisionContext*, f32*, Vec3f*, f32, UNK_PTR, u32*, Actor*); // ? func_8003DD6C(?); s32 func_8003DE84(CollisionContext*, Vec3f*, Vec3f*, Vec3f*, CollisionPoly**, u32, u32, u32, u32, u32*); s32 func_8003DF10(CollisionContext*, Vec3f*, Vec3f*, Vec3f*, CollisionPoly**, u32, u32, u32, u32, u32*, Actor*); -// ? func_8003DFA0(?); +s32 func_8003DFA0(CollisionContext*, Vec3f*, Vec3f*, Vec3f*, CollisionPoly**, u32, u32, u32, u32, u32*, Actor*, f32); // ? func_8003E0FC(?); // ? func_8003E188(?); // ? func_8003E214(?); @@ -659,7 +660,7 @@ UNK_TYPE func_80041D4C(CollisionContext*, CollisionPoly*, CollisionPoly*); // ? func_80041DB8(?); // ? func_80041EC8(?); // ? func_80041F10(?); -u16 func_80041F34(CollisionContext*, CollisionPoly*, u8); +u16 func_80041F34(CollisionContext*, CollisionPoly*, u32); s32 func_80041FA0(CollisionContext*, CollisionPoly*, u32); // ? func_80042048(?); // ? func_80042108(?); @@ -1149,7 +1150,7 @@ void Interface_LoadActionLabelB(GlobalContext* globalCtx, u16 action); s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange); void Rupees_ChangeBy(s16 rupeeChange); void Inventory_ChangeAmmo(s16 item, s16 ammoChange); -void func_80087680(GlobalContext* globalCtx); +void Magic_Fill(GlobalContext* globalCtx); void func_800876C8(GlobalContext* globalCtx); s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2); void func_80088AA0(s16 seconds); @@ -1262,6 +1263,7 @@ void func_80094678(GraphicsContext* gfxCtx); Gfx* func_800946E4(Gfx* gfx); Gfx* func_800947AC(Gfx* gfx); void func_80094A14(GraphicsContext* gfxCtx); +void func_80094B58(GraphicsContext* gfxCtx); void func_80094BC4(GraphicsContext* gfxCtx); void func_80094C50(GraphicsContext* gfxCtx); void func_80094D28(Gfx** gfxp); @@ -1850,7 +1852,7 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec); Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest); Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line); Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line); -Mtx* Matrix_SkinMatrix_MtxFToNewMtx(MtxF* src, GraphicsContext* gfxCtx); +Mtx* Matrix_MtxFToNewMtx(MtxF* src, GraphicsContext* gfxCtx); void Matrix_MultVec3f(Vec3f* src, Vec3f* dest); void Matrix_MtxFCopy(MtxF* dest, MtxF* src); void Matrix_MtxToMtxF(Mtx* src, MtxF* dest); @@ -2136,7 +2138,7 @@ void func_800E4FB0(void); // ? func_800E5A8C(?); // ? func_800E5AD8(?); // ? func_800E5AFC(?); -// ? func_800E5B20(?); +void func_800E5B20(u32, s8); // ? func_800E5B50(?); // ? func_800E5B80(?); // ? func_800E5C10(?); @@ -2152,7 +2154,7 @@ void func_800E4FB0(void); // ? func_800E6300(?); // ? func_800E6680(?); // ? func_800E66C0(?); -// ? func_800E67C0(?); +s32 Audio_NextRandom(void); // ? func_800E6818(?); // ? func_800E6840(?); void func_800E6880(void* mem, s32 size); @@ -2247,7 +2249,7 @@ void func_800ED858(u8); // ? func_800F28B4(?); // ? func_800F29FC(?); // ? func_800F2A04(?); -// ? func_800F2D6C(?); +void func_800F2D6C(u8*, u16); // ? func_800F2E28(?); // ? func_800F3054(?); // ? func_800F3188(?); @@ -2256,7 +2258,7 @@ void func_800ED858(u8); // ? func_800F35EC(?); // ? func_800F37B8(?); // ? func_800F3990(?); -// ? func_800F3A08(?); +void func_800F3A08(u8, u8, u8); // ? func_800F3ED4(?); void func_800F3F3C(u8); // ? func_800F3F84(?); @@ -2265,7 +2267,7 @@ void func_800F4138(Vec3f*, u16, f32); void func_800F4190(Vec3f*, u16); void func_800F436C(UNK_TYPE arg0, s16 arg1, f32 arg2); // ? func_800F4414(?); -// ? func_800F4524(?); +void func_800F4524(Vec3f*, u16, u8); void func_800F46E0(Vec3f* pos, f32 arg0); // ? func_800F4784(?); void func_800F47BC(void); @@ -2313,36 +2315,41 @@ void func_800F711C(); // ? func_800F7170(?); // ? func_800F71BC(?); void func_800F7260(u16); -// ? func_800F72B8(?); -// ? func_800F731C(?); -void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u32 a2, u32* a3, u32* a4, u32* a5); +void func_800F72B8(u8); +void func_800F731C(u8); +void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, u32* a3, u32* a4, u32* a5); // ? func_800F74E0(?); -// ? func_800F7680(?); -// ? func_800F7B54(?); -// ? func_800F7CEC(?); -// ? func_800F8480(?); -// ? func_800F87A0(?); -// ? func_800F8884(?); +void func_800F7680(void); +void func_800F7B54(u8, u8); +void func_800F7CEC(u8); +void func_800F8480(u8); +void func_800F87A0(u8); +void func_800F8884(u8, Vec3f*); +void func_800F89A0(u8, Vec3f*); void func_800F89E8(Vec3f*); -void func_800F8D04(u16 arg0); -// ? func_800F8D04(?); -// ? func_800F8E3C(?); -// ? func_800F8F34(?); -// ? func_800F8F88(?); -// ? func_800F8FF4(?); -// ? func_800F905C(?); +void func_800F8A44(Vec3f*, u16); +void func_800F8BA0(u8, u16); +void func_800F8D04(u32 sfxId); +void func_800F8E3C(void); +void func_800F8EA0(u8, u8, u16); +void func_800F8F34(u8); +void func_800F8F88(void); +u8 func_800F8FF4(u32 sfxId); +void func_800F905C(void); // ? func_800F9280(?); -// ? func_800F9474(?); -// ? func_800F94FC(?); -void Audio_SetBGM(u32 bgmID); -// ? func_800FA034(?); -u16 func_800FA0B4(s32 a0); -// ? func_800FA11C(?); -// ? func_800FA240(?); -// ? func_800FA3DC(?); -// ? func_800FAD34(?); -// ? func_800FADF8(?); -// ? func_800FAEB4(?); +void func_800F9474(u8, u16); +void func_800F94FC(u32); +void Audio_SetBGM(u32 bgmId); +void func_800FA034(void); +u16 func_800FA0B4(u8 a0); +s32 func_800FA11C(u32, s32); +void func_800FA174(u8); +void func_800FA18C(u8, u8); +void func_800FA240(u8, u8, u8, u8); +void func_800FA3DC(void); +u8 func_800FAD34(void); +void func_800FADF8(void); +void func_800FAEB4(void); void GfxPrint_InitDlist(GfxPrint*); void GfxPrint_SetColor(GfxPrint*, u32, u32, u32, u32); void GfxPrint_SetPosPx(GfxPrint*, s32, s32); @@ -2486,7 +2493,7 @@ s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes); void guScale(Mtx* m, f32 x, f32 y, f32 z); f32 sinf(f32); s16 sins(u16); -// ? func_801004C0(?); +OSTask* _VirtualToPhysicalTask(OSTask* intp); void osSpTaskLoad(OSTask* task); void osSpTaskStartGo(OSTask* task); s32 osSetRumble(OSPfs* pfs, u32 vibrate); @@ -2511,7 +2518,7 @@ s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, s32 size, u8 s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel); void __osPfsRequestOneChannel(s32 channel, u8 poll); void __osPfsGetOneChannelData(s32 channel, OSContStatus* contData); -// ? guMtxIdentF(?); +void guMtxIdentF(f32 mf[4][4]); void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); void guLookAt(Mtx*, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 length, s32* fileNo); @@ -2524,25 +2531,28 @@ s32 __osCheckPackId(OSPfs* pfs, __OSPackId* temp); s32 __osGetId(OSPfs* pfs); s32 __osCheckId(OSPfs* pfs); s32 __osPfsRWInode(OSPfs* pfs, __OSInode* inode, u8 flag, u8 bank); -// ? func_80102FA0(?); +void guMtxL2F(MtxF* m1, Mtx* m2); s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo); s32 osAfterPreNMI(void); s32 osContStartQuery(OSMesgQueue* mq); void osContGetQuery(OSContStatus* data); -// ? guLookAtHiliteF(?); +void guLookAtHiliteF(f32 mf[4][4], LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, + f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, + f32 xl2, f32 yl2, f32 zl2, + s32 hiliteWidth, s32 hiliteHeight); void guLookAtHilite(Mtx* m, LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, f32 xl2, f32 yl2, f32 zl2, s32 hiliteWidth, s32 hiliteHeight); u32 __osSpDeviceBusy(); -// ? guMtxIdent(?); +void guMtxIdent(f32 m[4][4]); void guPositionF(f32 mf[4][4], f32 rot, f32 pitch, f32 yaw, f32 scale, f32 x, f32 y, f32 z); void guPosition(Mtx*, f32, f32, f32, f32, f32, f32, f32); OSYieldResult osSpTaskYielded(OSTask* task); -// ? guRotateF(?); +void guRotateF(f32 m[4][4], f32 a, f32 x, f32 y, f32 z); void guRotate(Mtx*, f32 angle, f32 x, f32 y, f32 z); s32 osAiSetFrequency(u32 frequency); OSThread* __osGetActiveQueue(); -// ? guNormalize(?); +void guNormalize(f32* x, f32* y, f32* z); u32 osDpGetStatus(void); void osDpSetStatus(u32 status); s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName); @@ -2575,7 +2585,7 @@ u32 __osSpGetStatus(); void __osSpSetStatus(u32 status); void osWritebackDCacheAll(void); OSThread* __osGetCurrFaultedThread(); -// ? guMtxF2L(?); +void guMtxF2L(MtxF* m1, Mtx* m2); // ? __d_to_ll(?); // ? __f_to_ll(?); // ? __d_to_ull(?); diff --git a/include/macros.h b/include/macros.h index d61729e57b..251ba3e262 100644 --- a/include/macros.h +++ b/include/macros.h @@ -85,13 +85,20 @@ } \ (void)0 -extern GraphicsContext* oGfxCtx; +extern GraphicsContext* __gfxCtx; +#define WORK_DISP __gfxCtx->work.p +#define POLY_OPA_DISP __gfxCtx->polyOpa.p +#define POLY_XLU_DISP __gfxCtx->polyXlu.p +#define OVERLAY_DISP __gfxCtx->overlay.p + +// __gfxCtx shouldn't be used directly. +// Use the DISP macros defined above when writing to display buffers. #define OPEN_DISPS(gfxCtx, file, line) \ { \ - GraphicsContext* oGfxCtx; \ + GraphicsContext* __gfxCtx; \ Gfx* dispRefs[4]; \ - oGfxCtx = gfxCtx; \ + __gfxCtx = gfxCtx; \ Graph_OpenDisps(dispRefs, gfxCtx, file, line) #define CLOSE_DISPS(gfxCtx, file, line) \ diff --git a/include/variables.h b/include/variables.h index 79703e3a74..5f596427d8 100644 --- a/include/variables.h +++ b/include/variables.h @@ -612,8 +612,9 @@ extern s16 D_80130328[]; //extern ? D_80130500; extern f32 D_80130510; extern s32 D_80130514; -//extern ? D_80130570; -//extern ? D_80130578; +extern u8 D_80130570[8]; +extern u8 D_80130578[4][7]; +extern u8 D_80130594[4][7]; //extern ? D_801305B0; //extern ? D_801305B4; //extern ? D_801305B8; @@ -752,22 +753,23 @@ extern u8* gScarecrowSpawnSongPtr; //extern ? D_80131F68; //extern ? D_80131F6C; //extern ? D_8013331C; -//extern ? D_80133340; +extern u8 D_80133340[4]; //extern ? D_80133344; -//extern ? D_80133390; -//extern ? D_80133398; -//extern ? D_801333A0; -//extern ? D_801333A4; -//extern ? D_801333A8; -//extern ? D_801333C4; -//extern ? D_801333CC; -//extern ? D_801333D0; +extern s32 D_8013338C; +extern UNK_TYPE D_80133390[]; +extern UNK_TYPE D_80133398[]; +extern u8 D_801333A0; +extern u8 D_801333A4; +extern SoundBankEntry* gSoundBanks[7]; +extern u8 sBankSizes[7]; +extern u8 D_801333CC; +extern u16 D_801333D0; extern Vec3f D_801333D4; -extern u32 D_801333E0; -extern u32 D_801333E8; -//extern ? D_801333F0; -//extern ? D_801333F4; -//extern ? D_801333F8; +extern f32 D_801333E0; +extern f32 D_801333E8; +extern u8 D_801333F0; +extern u8 D_801333F4; +extern u8 D_801333F8; //extern ? D_80133400; //extern ? D_80133404; //extern ? D_80133408; @@ -3529,17 +3531,24 @@ extern FaultThreadStruct gFaultStruct; //extern ? D_8016BAB8; //extern ? D_8016BABC; //extern ? D_8016BAC0; +extern SoundBankEntry D_8016BAD0[9]; +extern SoundBankEntry D_8016BC80[12]; +extern SoundBankEntry D_8016BEC0[22]; +extern SoundBankEntry D_8016C2E0[20]; +extern SoundBankEntry D_8016C6A0[8]; +extern SoundBankEntry D_8016C820[3]; +extern SoundBankEntry D_8016C8B0[5]; //extern ? D_8016C9A0; -//extern ? D_8016E1A0; -//extern ? D_8016E1A8; -//extern ? D_8016E1B0; +extern u8 D_8016E1A0[7]; +extern u8 D_8016E1A8[7]; +extern u8 D_8016E1B0[7]; //extern ? D_8016E1B8; -//extern ? D_8016E260; -//extern ? D_8016E264; +extern u8 D_8016E260; +extern u8 D_8016E264[]; //extern ? D_8016E270; -//extern ? D_8016E2E0; -//extern ? D_8016E2F8; -//extern ? D_8016E310; +extern u16 D_8016E2E0[]; +extern u16 D_8016E2F8[]; +extern u8 D_8016E310[]; //extern ? D_8016E320; //extern ? D_8016E348; //extern ? D_8016E350; diff --git a/include/z64audio.h b/include/z64audio.h index bbd6b65c9e..cea8b1ff1b 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -742,4 +742,47 @@ typedef struct { /* 0x16 */ u16 unk_16; } Reverb; // size >= 0x18 +typedef struct { + /* 0x00 */ f32* posX; + /* 0x04 */ f32* posY; + /* 0x08 */ f32* posZ; + /* 0x0C */ u8 unk_C; + /* 0x10 */ u32* unk_10; + /* 0x14 */ u32* unk_14; + /* 0x18 */ u32* unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ u32 unk_20; + /* 0x24 */ u8 unk_24; + /* 0x26 */ u16 unk_26; + /* 0x28 */ u16 unk_28; // "flag" + /* 0x2A */ u8 unk_2A; + /* 0x2B */ u8 unk_2B; + /* 0x2C */ u8 prev; // prev bank index + /* 0x2D */ u8 next; // next bank index + /* 0x2E */ u8 unk_2E; + /* 0x2F */ u8 unk_2F; +} SoundBankEntry; // size = 0x30 + +/* + * SFX IDs + * + * index 0000000111111111 observed in audio code + * & 200 0000001000000000 single bit + * & 400 0000010000000000 single bit + * & 800 0000100000000000 single bit, what we currently call SFX_FLAG + * & 600 0000011000000000 2 bits + * & A00 0000101000000000 2 bits + * & C00 0000110000000000 2 bits, observed in audio code + * & E00 0000111000000000 all 3 bits + * bank 1111000000000000 observed in audio code + * + */ + +#define SFX_BANK_SHIFT(sfxId) ((sfxId >> 0xC) & 0xFF) + +#define SFX_BANK_MASK(sfxId) (sfxId & 0xF000) + +#define SFX_INDEX(sfxId) (sfxId & 0x01FF) +#define SFX_BANK(sfxId) SFX_BANK_SHIFT(SFX_BANK_MASK(sfxId)) + #endif diff --git a/include/z64player.h b/include/z64player.h index 7843f60886..c988905230 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -273,7 +273,7 @@ typedef struct Player { /* 0x0684 */ Actor* unk_684; /* 0x0688 */ Actor* boomerangActor; /* 0x068C */ Actor* naviActor; - /* 0x0690 */ s16 naviMessageId; + /* 0x0690 */ s16 naviTextId; /* 0x0692 */ u8 stateFlags3; /* 0x0693 */ s8 exchangeItemId; /* 0x0694 */ Actor* targetActor; diff --git a/spec b/spec index 82eb448f58..958503d7f3 100644 --- a/spec +++ b/spec @@ -419,7 +419,6 @@ beginseg include "build/src/code/code_800EC960.o" include "build/data/code_800EC960.data.o" include "build/src/code/code_800F7260.o" - include "build/data/code_800F7260.data.o" include "build/src/code/code_800F9280.o" include "build/data/code_800F9280.data.o" include "build/data/code_800F9280.rodata.o" @@ -461,7 +460,7 @@ beginseg include "build/src/libultra_code_O2/pfsallocatefile.o" include "build/src/libultra_code_O1/osStopTimer.o" include "build/src/libultra_code_O2/contpfs.o" - include "build/src/libultra_code_O2/code_80102FA0.o" + include "build/asm/guMtxL2F.o" include "build/src/libultra_code_O2/osPfsFindFile.o" include "build/src/libultra_code_O2/sqrtf.o" include "build/src/libultra_code_O2/osAfterPreNMI.o" @@ -487,7 +486,7 @@ beginseg include "build/src/libultra_code_O2/guS2DInitBg.o" include "build/src/libultra_code_O2/__osPfsSelectBank.o" include "build/src/libultra_code_O2/osContSetCh.o" - include "build/src/libultra_code_O2/code_80104D60.o" + include "build/src/libultra_code_O2/osPfsFileState.o" include "build/src/libultra_code_O2/pfsinitpak.o" include "build/src/libultra_code_O2/pfschecker.o" include "build/src/libultra_code_O2/osAiGetLength.o" @@ -845,8 +844,7 @@ endseg beginseg name "ovl_Bg_Hidan_Fwbig" include "build/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.o" - include "build/data/overlays/actors/z_bg_hidan_fwbig.data.o" - include "build/data/overlays/actors/z_bg_hidan_fwbig.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Hidan_Fwbig/ovl_Bg_Hidan_Fwbig_reloc.o" endseg beginseg @@ -970,8 +968,7 @@ endseg beginseg name "ovl_Bg_Jya_Bombchuiwa" include "build/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.o" - include "build/data/overlays/actors/z_bg_jya_bombchuiwa.data.o" - include "build/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/ovl_Bg_Jya_Bombchuiwa_reloc.o" endseg beginseg @@ -1267,8 +1264,7 @@ endseg beginseg name "ovl_Bg_Spot11_Oasis" include "build/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.o" - include "build/data/overlays/actors/z_bg_spot11_oasis.data.o" - include "build/data/overlays/actors/z_bg_spot11_oasis.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot11_Oasis/ovl_Bg_Spot11_Oasis_reloc.o" endseg beginseg @@ -2238,8 +2234,11 @@ endseg beginseg name "ovl_En_Elf" include "build/src/overlays/actors/ovl_En_Elf/z_en_elf.o" - include "build/data/overlays/actors/z_en_elf.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Elf/ovl_En_Elf_reloc.o" +#else include "build/data/overlays/actors/z_en_elf.reloc.o" +#endif endseg beginseg @@ -2788,8 +2787,7 @@ endseg beginseg name "ovl_En_Niw" include "build/src/overlays/actors/ovl_En_Niw/z_en_niw.o" - include "build/data/overlays/actors/z_en_niw.data.o" - include "build/data/overlays/actors/z_en_niw.reloc.o" + include "build/src/overlays/actors/ovl_En_Niw/ovl_En_Niw_reloc.o" endseg beginseg @@ -3541,8 +3539,7 @@ endseg beginseg name "ovl_Obj_Oshihiki" include "build/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.o" - include "build/data/overlays/actors/z_obj_oshihiki.data.o" - include "build/data/overlays/actors/z_obj_oshihiki.reloc.o" + include "build/src/overlays/actors/ovl_Obj_Oshihiki/ovl_Obj_Oshihiki_reloc.o" endseg beginseg diff --git a/src/code/code_800E11F0.c b/src/code/code_800E11F0.c index 3cf45a3ed7..43d3ac1054 100644 --- a/src/code/code_800E11F0.c +++ b/src/code/code_800E11F0.c @@ -229,6 +229,6 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E66C0.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E67C0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6818.s") diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index e2f087821a..31ba7bdf0a 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -1,40 +1,638 @@ #include "ultra64.h" #include "global.h" +#include "vt.h" -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F7260.s") +typedef struct { + /* 0x00 */ u16 sfxId; + /* 0x04 */ Vec3f* pos; + /* 0x08 */ u8 unk_8; + /* 0x0C */ u32* unk_C; + /* 0x10 */ u32* unk_10; + /* 0x14 */ u32* unk_14; +} Struct_800F738C; // size = 0x18 -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F72B8.s") +typedef struct { + /* 0x00 */ f32 unk_0; + /* 0x04 */ f32 unk_4; + /* 0x08 */ f32 unk_8; + /* 0x0C */ u16 unk_C; +} Struct_800F8EA0; // size = 0x10 -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F731C.s") +typedef struct { + u32 unk_0; + u8 unk_4; +} Struct_800F7CEC; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/Audio_PlaySoundGeneral.s") +typedef struct { + u8 unk_0; + u16 unk_2; +} Struct_8013331C; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F74E0.s") +u8 D_80133340[4] = { + 0x53, + 0x45, + 0x00, + 0x00, +}; +char D_80133344[] = VT_COL(RED, WHITE) " dist over! flag:%04X ptr:%08X pos:%f-%f-%f" VT_RST "\n"; + +s32 D_8013338C = 0; + +UNK_TYPE D_80133390[] = { + 0x53455120, + 0x48000000, +}; + +UNK_TYPE D_80133398[] = { + 0x20202020, + 0x4C000000, +}; + +u8 D_801333A0 = 0; + +u8 D_801333A4 = 0; + +/** + * Array of pointers to arrays of SoundBankEntry of sizes: 9, 12, 22, 20, 8, 3, 5 + * + * 0 : Player Bank size 9 + * 1 : Item Bank size 12 + * 2 : Environment Bank size 22 + * 3 : Enemy Bank size 20 + * 4 : System Bank size 8 + * 5 : Ocarina Bank size 3 + * 6 : Voice Bank size 5 + */ +SoundBankEntry* gSoundBanks[7] = { + D_8016BAD0, D_8016BC80, D_8016BEC0, D_8016C2E0, D_8016C6A0, D_8016C820, D_8016C8B0, +}; + +u8 sBankSizes[ARRAY_COUNT(gSoundBanks)] = { + ARRAY_COUNT(D_8016BAD0), ARRAY_COUNT(D_8016BC80), ARRAY_COUNT(D_8016BEC0), ARRAY_COUNT(D_8016C2E0), + ARRAY_COUNT(D_8016C6A0), ARRAY_COUNT(D_8016C820), ARRAY_COUNT(D_8016C8B0), +}; + +u8 D_801333CC = 0; + +u16 D_801333D0 = 0; + +Vec3f D_801333D4 = { 0.0f, 0.0f, 0.0f }; + +f32 D_801333E0 = 1.0f; + +UNK_TYPE D_801333E4 = 0; + +f32 D_801333E8 = 0.0f; + +UNK_TYPE D_801333EC = 0; + +u8 D_801333F0 = 0; + +u8 D_801333F4 = 0; + +u8 D_801333F8 = 0; + +extern Struct_800F738C D_8016C9A0[]; +extern Struct_800F7CEC D_8016E1B8[7][3]; // total size = 0xA8 +extern Struct_800F8EA0 D_8016E270[]; +extern Struct_8013331C* D_8013331C[9]; + +void func_800F7260(u16 arg0) { + u8 bankId; + + for (bankId = 0; bankId < ARRAY_COUNT(gSoundBanks); bankId++) { + if (arg0 & 1) { + D_8016E264[bankId] = 1; + } else { + D_8016E264[bankId] = 0; + } + arg0 = (arg0 >> 1) & 0xFFFF; + } +} + +void func_800F72B8(u8 arg0) { + D_801333D0 |= (1 << arg0); + func_800FA240(0, 2, 0x40, 0xF); + func_800FA240(3, 2, 0x40, 0xF); +} + +void func_800F731C(u8 arg0) { + D_801333D0 &= ((1 << arg0) ^ 0xFFFF); + if (D_801333D0 == 0) { + func_800FA240(0, 2, 0x7F, 0xF); + func_800FA240(3, 2, 0x7F, 0xF); + } +} + +void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, u32* a3, u32* a4, u32* a5) { + u8 i; + Struct_800F738C* phi_v0; + + if (D_8016E264[SFX_BANK_SHIFT(sfxId)] == 0) { + phi_v0 = &D_8016C9A0[D_801333A0]; + if (D_801333F4 == 0) { + for (i = 0; i < 10; i++) { + if (sfxId == D_8016E2E0[i]) { + if (D_8016E310[i] == 0) { + sfxId = D_8016E2F8[i]; + } else { + phi_v0->sfxId = D_8016E2F8[i]; + phi_v0->pos = a1; + phi_v0->unk_8 = a2; + phi_v0->unk_C = a3; + phi_v0->unk_10 = a4; + phi_v0->unk_14 = a5; + D_801333A0++; + phi_v0 = &D_8016C9A0[D_801333A0]; + } + i = 10; + } + } + } + phi_v0->sfxId = sfxId; + phi_v0->pos = a1; + phi_v0->unk_8 = a2; + phi_v0->unk_C = a3; + phi_v0->unk_10 = a4; + phi_v0->unk_14 = a5; + D_801333A0++; + } +} + +void func_800F74E0(u8 arg0, SoundBankEntry* arg1) { + Struct_800F738C* entry; + s32 phi_a0; + u8 i = D_801333A4; + + while (i != D_801333A0) { + phi_a0 = false; + entry = &D_8016C9A0[i]; + switch (arg0) { + case 0: + if (SFX_BANK_MASK(entry->sfxId) == SFX_BANK_MASK(arg1->unk_28)) { + phi_a0 = true; + } + break; + case 1: + if (SFX_BANK_MASK(entry->sfxId) == SFX_BANK_MASK(arg1->unk_28) && (&entry->pos->x == arg1->posX)) { + phi_a0 = true; + } + break; + case 2: + if (&entry->pos->x == arg1->posX) { + phi_a0 = true; + } + break; + case 3: + if (&entry->pos->x == arg1->posX && entry->sfxId == arg1->unk_28) { + phi_a0 = true; + } + break; + case 4: + if (entry->unk_8 == arg1->unk_C && entry->sfxId == arg1->unk_28) { + phi_a0 = true; + } + break; + case 5: + if (entry->sfxId == arg1->unk_28) { + phi_a0 = true; + } + break; + } + if (phi_a0) { + entry->sfxId = 0; + } + i++; + } +} + +#ifdef NON_EQUIVALENT +// Mostly ok at the start, then runs into some reorderings near the assignments +// of temp_s0 and temp_a2, inducing regalloc throughout the rest +void func_800F7680(void) { + u8 sp43; + Struct_8013331C* temp_a2; + SoundBankEntry* temp_s0; + s32 phi_s5; + Struct_800F738C* phi_t2; + u8 phi_a1; + u8 phi_t4; + s32 phi_s1; + + phi_t2 = &D_8016C9A0[D_801333A4]; + phi_s1 = 0x80; + if (phi_t2->sfxId == 0) { + return; + } + phi_s5 = SFX_BANK(phi_t2->sfxId); + if ((1 << phi_s5) & D_801333F0) { + func_800F2D6C(D_80133340, phi_t2->sfxId); + phi_s5 = SFX_BANK(phi_t2->sfxId); + } + phi_t4 = 0; + phi_a1 = gSoundBanks[phi_s5][0].next; + while (phi_a1 != 0xFF && phi_a1 != 0) { + if (gSoundBanks[phi_s5][phi_a1].posX == &phi_t2->pos->x) { + temp_a2 = &D_8013331C[SFX_BANK_SHIFT(phi_t2->sfxId)][SFX_INDEX(phi_t2->sfxId)]; + temp_s0 = &gSoundBanks[phi_s5][phi_a1]; + if (!(temp_a2->unk_2 & 0x20) || temp_s0->unk_24 != temp_a2->unk_0) { + if (temp_s0->unk_28 == phi_t2->sfxId) { + phi_t4 = D_80130594[phi_s5][D_801333CC]; + } else { + //!@bug possibly uninitialized sp43 ? confirm when matching + if (phi_t4 == 0) { + phi_s1 = phi_a1; + sp43 = D_8013331C[SFX_BANK_SHIFT(temp_s0->unk_28)][SFX_INDEX(temp_s0->unk_28)].unk_0; + } else if (temp_s0->unk_24 < sp43) { + if (1) {} + if (1) {} + if (1) {} + if (1) {} + if (1) {} + if (1) {} + phi_s1 = phi_a1; + sp43 = D_8013331C[SFX_BANK_SHIFT(temp_s0->unk_28)][SFX_INDEX(temp_s0->unk_28)].unk_0; + } + phi_t4++; + if (phi_t4 == D_80130594[phi_s5][D_801333CC]) { + phi_a1 = (temp_a2->unk_0 >= sp43) ? phi_s1 : 0; + } + } + if (D_80130594[phi_s5][D_801333CC] == phi_t4) { + if ((phi_t2->sfxId & 0xC00) || (temp_a2->unk_2 & 4) || phi_a1 == phi_s1) { + if ((gSoundBanks[phi_s5][phi_a1].unk_26 & 8) && gSoundBanks[phi_s5][phi_a1].unk_2A != 1) { + func_800F731C(gSoundBanks[phi_s5][phi_a1].unk_2E); + } + gSoundBanks[phi_s5][phi_a1].unk_C = phi_t2->unk_8; + gSoundBanks[phi_s5][phi_a1].unk_28 = phi_t2->sfxId; + gSoundBanks[phi_s5][phi_a1].unk_2A = 1; + gSoundBanks[phi_s5][phi_a1].unk_2B = 2; + gSoundBanks[phi_s5][phi_a1].unk_10 = phi_t2->unk_C; + gSoundBanks[phi_s5][phi_a1].unk_14 = phi_t2->unk_10; + gSoundBanks[phi_s5][phi_a1].unk_18 = phi_t2->unk_14; + gSoundBanks[phi_s5][phi_a1].unk_26 = temp_a2->unk_2; + gSoundBanks[phi_s5][phi_a1].unk_24 = temp_a2->unk_0; + } else if (gSoundBanks[phi_s5][phi_a1].unk_2A == 5) { + gSoundBanks[phi_s5][phi_a1].unk_2A = 4; + } + phi_a1 = 0; + } + } else { + return; + } + } + if (phi_a1 != 0) { + phi_a1 = gSoundBanks[phi_s5][phi_a1].next; + } + } + if (gSoundBanks[phi_s5][D_8016E1A8[phi_s5]].next != 0xFF && phi_a1 != 0) { + phi_a1 = D_8016E1A8[phi_s5]; + temp_s0 = &gSoundBanks[phi_s5][phi_a1]; + temp_s0->posX = &phi_t2->pos->x; + temp_s0->posY = &phi_t2->pos->y; + temp_s0->posZ = &phi_t2->pos->z; + temp_s0->unk_C = phi_t2->unk_8; + temp_s0->unk_10 = phi_t2->unk_C; + temp_s0->unk_14 = phi_t2->unk_10; + temp_s0->unk_18 = phi_t2->unk_14; + temp_a2 = &D_8013331C[SFX_BANK_SHIFT(phi_t2->sfxId)][SFX_INDEX(phi_t2->sfxId)]; + temp_s0->unk_26 = temp_a2->unk_2; + temp_s0->unk_24 = temp_a2->unk_0; + temp_s0->unk_28 = phi_t2->sfxId; + temp_s0->unk_2A = 1; + temp_s0->unk_2B = 2; + temp_s0->prev = D_8016E1A0[phi_s5]; + gSoundBanks[phi_s5][D_8016E1A0[phi_s5]].next = D_8016E1A8[phi_s5]; + D_8016E1A0[phi_s5] = D_8016E1A8[phi_s5]; + D_8016E1A8[phi_s5] = gSoundBanks[phi_s5][D_8016E1A8[phi_s5]].next; + gSoundBanks[phi_s5][D_8016E1A8[phi_s5]].prev = 0xFF; + temp_s0->next = 0xFF; + } +} +#else +void func_800F7680(void); #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F7680.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F7B54.s") +void func_800F7B54(u8 bankId, u8 bankIndex) { + SoundBankEntry* entry = &gSoundBanks[bankId][bankIndex]; + u8 i; + + if (entry->unk_26 & 8) { + func_800F731C(entry->unk_2E); + } + if (bankIndex == D_8016E1A0[bankId]) { + D_8016E1A0[bankId] = entry->prev; + } else { + gSoundBanks[bankId][entry->next].prev = entry->prev; + } + gSoundBanks[bankId][entry->prev].next = entry->next; + entry->next = D_8016E1A8[bankId]; + entry->prev = 0xFF; + gSoundBanks[bankId][D_8016E1A8[bankId]].prev = bankIndex; + D_8016E1A8[bankId] = bankIndex; + entry->unk_2A = 0; + + for (i = 0; i < D_80130578[D_801333CC][bankId]; i++) { + if (D_8016E1B8[bankId][i].unk_4 == bankIndex) { + D_8016E1B8[bankId][i].unk_4 = 0xFF; + i = D_80130578[D_801333CC][bankId]; + } + } +} #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F7CEC.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8480.s") +void func_800F8480(u8 bankId) { + u8 bankIndex; + SequenceChannel* seqChannel; + SoundBankEntry* entry; + u8 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F87A0.s") + for (i = 0; i < D_80130578[D_801333CC][bankId]; i++) { + bankIndex = D_8016E1B8[bankId][i].unk_4; + if (bankIndex != 0xFF) { + entry = &gSoundBanks[bankId][bankIndex]; + seqChannel = gAudioContext.gSequencePlayers[2].channels[D_8016E260]; + if (entry->unk_2A == 2) { + entry->unk_2E = D_8016E260; + if (entry->unk_26 & 8) { + func_800F72B8(D_8016E260); + } + if (entry->unk_26 & 0xC0) { + switch (entry->unk_26 & 0xC0) { + case 0x40: + entry->unk_2F = Audio_NextRandom() & 0xF; + break; + case 0x80: + entry->unk_2F = Audio_NextRandom() & 0x1F; + break; + case 0xC0: + entry->unk_2F = Audio_NextRandom() & 0x3F; + break; + default: + entry->unk_2F = 0; + break; + } + } + func_800F3A08(bankId, bankIndex, D_8016E260); + func_800E5B20(0x06020000 | ((D_8016E260 & 0xFF) << 8), 1); + func_800E5B20(0x06020000 | ((D_8016E260 & 0xFF) << 8) | 4, entry->unk_28 & 0xFF); + if (D_80130570[bankId] != 0) { + func_800E5B20(0x06020000 | ((D_8016E260 & 0xFF) << 8) | 5, (entry->unk_28 & 0x100) >> 8); + } + if (entry->unk_28 & 0xC00) { + entry->unk_2A = 4; + } else { + entry->unk_2A = 5; + } + } else if ((u8)seqChannel->soundScriptIO[1] == 0xFF) { + func_800F7B54(bankId, bankIndex); + } else if (entry->unk_2A == 3) { + func_800F3A08(bankId, bankIndex, D_8016E260); + if (entry->unk_28 & 0xC00) { + entry->unk_2A = 4; + } else { + entry->unk_2A = 5; + } + } + } + D_8016E260++; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8884.s") +void func_800F87A0(u8 bankId) { + SoundBankEntry* entry; + s32 pad; + SoundBankEntry sp48; + u8 bankIndex = gSoundBanks[bankId][0].next; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F89E8.s") + while (bankIndex != 0xFF) { + entry = &gSoundBanks[bankId][bankIndex]; + if (entry->unk_2A >= 3) { + func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + } + if (entry->unk_2A != 0) { + func_800F7B54(bankId, bankIndex); + } + bankIndex = gSoundBanks[bankId][0].next; + } + sp48.unk_28 = bankId << 0xC; + func_800F74E0(0, &sp48); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8A44.s") +void func_800F8884(u8 bankId, Vec3f* pos) { + SoundBankEntry* entry; + u8 bankIndex = gSoundBanks[bankId][0].next; + u8 bankIndex2 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8D04.s") + while (bankIndex != 0xFF) { + entry = &gSoundBanks[bankId][bankIndex]; + if (entry->posX == &pos->x) { + if (entry->unk_2A >= 3) { + func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + } + if (entry->unk_2A != 0) { + func_800F7B54(bankId, bankIndex); + } + } else { + bankIndex2 = bankIndex; + } + bankIndex = gSoundBanks[bankId][bankIndex2].next; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8E3C.s") +void func_800F89A0(u8 bankId, Vec3f* pos) { + SoundBankEntry sp18; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8F34.s") + func_800F8884(bankId, pos); + sp18.unk_28 = bankId << 0xC; + sp18.posX = &pos->x; + func_800F74E0(1, &sp18); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8F88.s") +void func_800F89E8(Vec3f* pos) { + u8 i; + SoundBankEntry sp24; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F8FF4.s") + for (i = 0; i < ARRAY_COUNT(gSoundBanks); i++) { + func_800F8884(i, pos); + } + sp24.posX = &pos->x; + func_800F74E0(2, &sp24); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F905C.s") +void func_800F8A44(Vec3f* pos, u16 sfxId) { + SoundBankEntry* entry; + u8 bankIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; + u8 bankIndex2 = 0; + SoundBankEntry sp50; + + while (bankIndex != 0xFF) { + entry = &gSoundBanks[SFX_BANK(sfxId)][bankIndex]; + if (entry->posX == &pos->x && entry->unk_28 == sfxId) { + if (entry->unk_2A >= 3) { + func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + } + if (entry->unk_2A != 0) { + func_800F7B54(SFX_BANK(sfxId), bankIndex); + } + bankIndex = 0xFF; + } else { + bankIndex2 = bankIndex; + } + if (bankIndex != 0xFF) { + bankIndex = gSoundBanks[SFX_BANK(sfxId)][bankIndex2].next; + } + } + sp50.posX = &pos->x; + sp50.unk_28 = sfxId; + func_800F74E0(3, &sp50); +} + +void func_800F8BA0(u8 arg0, u16 sfxId) { + SoundBankEntry* entry; + u8 bankIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; + u8 bankIndex2 = 0; + SoundBankEntry sp58; + + while (bankIndex != 0xFF) { + entry = &gSoundBanks[SFX_BANK(sfxId)][bankIndex]; + if (entry->unk_C == arg0 && entry->unk_28 == sfxId) { + if (entry->unk_2A >= 3) { + func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + } + if (entry->unk_2A != 0) { + func_800F7B54(SFX_BANK(sfxId), bankIndex); + } + } else { + bankIndex2 = bankIndex; + } + if (bankIndex != 0xFF) { + bankIndex = gSoundBanks[SFX_BANK(sfxId)][bankIndex2].next; + } + } + sp58.unk_C = arg0; + sp58.unk_28 = sfxId; + func_800F74E0(4, &sp58); +} + +void func_800F8D04(u32 sfxId) { + SoundBankEntry* entry; + u8 bankIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; + u8 bankIndex2 = 0; + SoundBankEntry sp50; + + while (bankIndex != 0xFF) { + entry = &gSoundBanks[SFX_BANK(sfxId)][bankIndex]; + if (entry->unk_28 == sfxId) { + if (entry->unk_2A >= 3) { + func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + } + if (entry->unk_2A != 0) { + func_800F7B54(SFX_BANK(sfxId), bankIndex); + } + } else { + bankIndex2 = bankIndex; + } + bankIndex = gSoundBanks[SFX_BANK(sfxId)][bankIndex2].next; + } + sp50.unk_28 = sfxId; + func_800F74E0(5, &sp50); +} + +void func_800F8E3C(void) { + while (D_801333A0 != D_801333A4) { + func_800F7680(); + D_801333A4++; + } +} + +void func_800F8EA0(u8 arg0, u8 arg1, u16 arg2) { + if (arg2 == 0) { + arg2++; + } + D_8016E270[arg0].unk_4 = arg1 / 127.0f; + D_8016E270[arg0].unk_C = arg2; + D_8016E270[arg0].unk_8 = ((D_8016E270[arg0].unk_0 - D_8016E270[arg0].unk_4) / arg2); +} + +void func_800F8F34(u8 arg0) { + if (D_8016E270[arg0].unk_C != 0) { + D_8016E270[arg0].unk_C--; + if (D_8016E270[arg0].unk_C != 0) { + D_8016E270[arg0].unk_0 -= D_8016E270[arg0].unk_8; + } else { + D_8016E270[arg0].unk_0 = D_8016E270[arg0].unk_4; + } + } +} + +void func_800F8F88(void) { + u8 i; + + if (IS_SEQUENCE_CHANNEL_VALID(gAudioContext.gSequencePlayers[2].channels[0])) { + D_8016E260 = 0; + for (i = 0; i < ARRAY_COUNT(gSoundBanks); i++) { + func_800F7CEC(i); + func_800F8480(i); + func_800F8F34(i); + } + } +} + +u8 func_800F8FF4(u32 sfxId) { + SoundBankEntry* entry; + u8 bankIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; + + while (bankIndex != 0xFF) { + entry = &gSoundBanks[SFX_BANK(sfxId)][bankIndex]; + if (entry->unk_28 == sfxId) { + return true; + } + bankIndex = entry->next; + } + return false; +} + +void func_800F905C(void) { + u8 bankId; + u8 i; + u8 bankIndex; + + D_801333A0 = 0; + D_801333A4 = 0; + D_801333D0 = 0; + for (bankId = 0; bankId < ARRAY_COUNT(gSoundBanks); bankId++) { + D_8016E1A0[bankId] = 0; + D_8016E1A8[bankId] = 1; + D_8016E1B0[bankId] = 0; + D_8016E264[bankId] = 0; + D_8016E270[bankId].unk_0 = 1.0f; + D_8016E270[bankId].unk_C = 0; + } + for (bankId = 0; bankId < ARRAY_COUNT(gSoundBanks); bankId++) { + for (i = 0; i < 3; i++) { + D_8016E1B8[bankId][i].unk_4 = 0xFF; + } + } + for (bankId = 0; bankId < ARRAY_COUNT(gSoundBanks); bankId++) { + gSoundBanks[bankId][0].prev = 0xFF; + gSoundBanks[bankId][0].next = 0xFF; + for (i = 1; i < sBankSizes[bankId] - 1; i++) { + gSoundBanks[bankId][i].prev = i - 1; + gSoundBanks[bankId][i].next = i + 1; + } + gSoundBanks[bankId][i].prev = i - 1; + gSoundBanks[bankId][i].next = 0xFF; + } + if (D_801333F8 == 0) { + for (bankId = 0; bankId < 10; bankId++) { + D_8016E2E0[bankId] = 0; + D_8016E2F8[bankId] = 0; + D_8016E310[bankId] = 0; + } + D_801333F8++; + } +} diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 44707957ad..a2bef505a6 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -46,9 +46,9 @@ void FlagSet_Update(GlobalContext* globalCtx) { GfxPrint printer; s32 pad; - polyOpa = oGfxCtx->polyOpa.p; + polyOpa = POLY_OPA_DISP; gfx = Graph_GfxPlusOne(polyOpa); - gSPDisplayList(oGfxCtx->overlay.p++, gfx); + gSPDisplayList(OVERLAY_DISP++, gfx); GfxPrint_Init(&printer); GfxPrint_Open(&printer, gfx); @@ -141,7 +141,7 @@ void FlagSet_Update(GlobalContext* globalCtx) { gSPEndDisplayList(gfx++); Graph_BranchDlist(polyOpa, gfx); - oGfxCtx->polyOpa.p = gfx; + POLY_OPA_DISP = gfx; } if (CHECK_BTN_ALL(input->press.button, BTN_L)) { diff --git a/src/code/game.c b/src/code/game.c index bafc504696..ce0d91c9e2 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -151,8 +151,8 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../game.c", 746); - newDList = Graph_GfxPlusOne(polyOpaP = oGfxCtx->polyOpa.p); - gSPDisplayList(oGfxCtx->overlay.p++, newDList); + newDList = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); + gSPDisplayList(OVERLAY_DISP++, newDList); if (R_ENABLE_FB_FILTER == 1) { GameState_SetFBFilter(&newDList); @@ -186,7 +186,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { gSPEndDisplayList(newDList++); Graph_BranchDlist(polyOpaP, newDList); - oGfxCtx->polyOpa.p = newDList; + POLY_OPA_DISP = newDList; if (1) {} @@ -203,15 +203,15 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../game.c", 814); - gSPSegment(oGfxCtx->polyOpa.p++, 0, 0); - gSPSegment(oGfxCtx->polyOpa.p++, 0xF, gfxCtx->curFrameBuffer); - gSPSegment(oGfxCtx->polyOpa.p++, 0xE, gZBuffer); - gSPSegment(oGfxCtx->polyXlu.p++, 0, 0); - gSPSegment(oGfxCtx->polyXlu.p++, 0xF, gfxCtx->curFrameBuffer); - gSPSegment(oGfxCtx->polyXlu.p++, 0xE, gZBuffer); - gSPSegment(oGfxCtx->overlay.p++, 0, 0); - gSPSegment(oGfxCtx->overlay.p++, 0xF, gfxCtx->curFrameBuffer); - gSPSegment(oGfxCtx->overlay.p++, 0xE, gZBuffer); + gSPSegment(POLY_OPA_DISP++, 0, 0); + gSPSegment(POLY_OPA_DISP++, 0xF, gfxCtx->curFrameBuffer); + gSPSegment(POLY_OPA_DISP++, 0xE, gZBuffer); + gSPSegment(POLY_XLU_DISP++, 0, 0); + gSPSegment(POLY_XLU_DISP++, 0xF, gfxCtx->curFrameBuffer); + gSPSegment(POLY_XLU_DISP++, 0xE, gZBuffer); + gSPSegment(OVERLAY_DISP++, 0, 0); + gSPSegment(OVERLAY_DISP++, 0xF, gfxCtx->curFrameBuffer); + gSPSegment(OVERLAY_DISP++, 0xE, gZBuffer); CLOSE_DISPS(gfxCtx, "../game.c", 838); } @@ -222,12 +222,12 @@ void func_800C49F4(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../game.c", 846); - newDlist = Graph_GfxPlusOne(polyOpaP = oGfxCtx->polyOpa.p); - gSPDisplayList(oGfxCtx->overlay.p++, newDlist); + newDlist = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); + gSPDisplayList(OVERLAY_DISP++, newDlist); gSPEndDisplayList(newDlist++); Graph_BranchDlist(polyOpaP, newDlist); - oGfxCtx->polyOpa.p = newDlist; + POLY_OPA_DISP = newDlist; if (1) {} diff --git a/src/code/graph.c b/src/code/graph.c index 3ba23f9ff1..9d568068cb 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -220,7 +220,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { task->data_ptr = (u64*)gfxCtx->workBuffer; OPEN_DISPS(gfxCtx, "../graph.c", 828); - task->data_size = (u32)oGfxCtx->work.p - (u32)gfxCtx->workBuffer; + task->data_size = (u32)WORK_DISP - (u32)gfxCtx->workBuffer; CLOSE_DISPS(gfxCtx, "../graph.c", 830); { s32 pad2; } // Necessary to match stack usage @@ -268,10 +268,10 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { OPEN_DISPS(gfxCtx, "../graph.c", 966); - gDPNoOpString(oGfxCtx->work.p++, "WORK_DISP 開始", 0); - gDPNoOpString(oGfxCtx->polyOpa.p++, "POLY_OPA_DISP 開始", 0); - gDPNoOpString(oGfxCtx->polyXlu.p++, "POLY_XLU_DISP 開始", 0); - gDPNoOpString(oGfxCtx->overlay.p++, "OVERLAY_DISP 開始", 0); + gDPNoOpString(WORK_DISP++, "WORK_DISP 開始", 0); + gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 開始", 0); + gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 開始", 0); + gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 開始", 0); CLOSE_DISPS(gfxCtx, "../graph.c", 975); @@ -280,21 +280,21 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { OPEN_DISPS(gfxCtx, "../graph.c", 987); - gDPNoOpString(oGfxCtx->work.p++, "WORK_DISP 終了", 0); - gDPNoOpString(oGfxCtx->polyOpa.p++, "POLY_OPA_DISP 終了", 0); - gDPNoOpString(oGfxCtx->polyXlu.p++, "POLY_XLU_DISP 終了", 0); - gDPNoOpString(oGfxCtx->overlay.p++, "OVERLAY_DISP 終了", 0); + gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0); + gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0); + gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0); + gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 終了", 0); CLOSE_DISPS(gfxCtx, "../graph.c", 996); OPEN_DISPS(gfxCtx, "../graph.c", 999); - gSPBranchList(oGfxCtx->work.p++, gfxCtx->polyOpaBuffer); - gSPBranchList(oGfxCtx->polyOpa.p++, gfxCtx->polyXluBuffer); - gSPBranchList(oGfxCtx->polyXlu.p++, gfxCtx->overlayBuffer); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPFullSync(oGfxCtx->overlay.p++); - gSPEndDisplayList(oGfxCtx->overlay.p++); + gSPBranchList(WORK_DISP++, gfxCtx->polyOpaBuffer); + gSPBranchList(POLY_OPA_DISP++, gfxCtx->polyXluBuffer); + gSPBranchList(POLY_XLU_DISP++, gfxCtx->overlayBuffer); + gDPPipeSync(OVERLAY_DISP++); + gDPFullSync(OVERLAY_DISP++); + gSPEndDisplayList(OVERLAY_DISP++); CLOSE_DISPS(gfxCtx, "../graph.c", 1028); diff --git a/src/code/mtxuty-cvt.c b/src/code/mtxuty-cvt.c index 345059dba3..ff030d9c39 100644 --- a/src/code/mtxuty-cvt.c +++ b/src/code/mtxuty-cvt.c @@ -19,5 +19,5 @@ void MtxConv_F2L(MatrixInternal* m1, MtxF* m2) { void MtxConv_L2F(MtxF* m1, MatrixInternal* m2) { LogUtils_CheckNullPointer("m1", m1, "../mtxuty-cvt.c", 55); LogUtils_CheckNullPointer("m2", m2, "../mtxuty-cvt.c", 56); - func_80102FA0(m1, m2); // guMtxL2F ? + guMtxL2F(m1, (Mtx*)m2); } diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index b1ee055a32..1dc6d54959 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -74,7 +74,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { SET_FULLSCREEN_VIEWPORT(&view); - gfx = oGfxCtx->overlay.p; + gfx = OVERLAY_DISP; func_800AB9EC(&view, 0xF, &gfx); gDPPipeSync(gfx++); @@ -96,7 +96,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { } gDPPipeSync(gfx++); - oGfxCtx->overlay.p = gfx; + OVERLAY_DISP = gfx; CLOSE_DISPS(gfxCtx, "../speed_meter.c", 276); } @@ -130,7 +130,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC SET_FULLSCREEN_VIEWPORT(&view); - gfx = oGfxCtx->overlay.p; + gfx = OVERLAY_DISP; func_800AB9EC(&view, 0xF, &gfx); gDPPipeSync(gfx++); @@ -145,7 +145,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC gDPPipeSync(gfx++); - oGfxCtx->overlay.p = gfx; + OVERLAY_DISP = gfx; CLOSE_DISPS(gfxCtx, "../speed_meter.c", 339); } } diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index ec7b6f8ab5..310171e00a 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -618,7 +618,7 @@ Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line) { return Matrix_ToMtx(Graph_Alloc(gfxCtx, sizeof(Mtx)), file, line); } -Mtx* Matrix_SkinMatrix_MtxFToNewMtx(MtxF* src, GraphicsContext* gfxCtx) { +Mtx* Matrix_MtxFToNewMtx(MtxF* src, GraphicsContext* gfxCtx) { return Matrix_MtxFToMtx(src, Graph_Alloc(gfxCtx, sizeof(Mtx))); } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 000b012d8f..ab31237886 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -22,19 +22,19 @@ void func_8002B200(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gfx* if (temp1 >= -50.0f && temp1 < 500.0f) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1553); - oGfxCtx->polyOpa.p = Gfx_CallSetupDL(oGfxCtx->polyOpa.p, 0x2C); + POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); - gDPSetCombineLERP(oGfxCtx->polyOpa.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, + gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); temp1 = (temp1 < 0.0f) ? 0.0f : ((temp1 > 150.0f) ? 150.0f : temp1); temp2 = 1.0f - (temp1 * (1.f / 350)); if (color != NULL) { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, color->r, color->g, color->b, + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color->r, color->g, color->b, (u32)(actor->shape.unk_14 * temp2) & 0xFF); } else { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, (u32)(actor->shape.unk_14 * temp2) & 0xFF); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, (u32)(actor->shape.unk_14 * temp2) & 0xFF); } func_80038A28(actor->floorPoly, actor->posRot.pos.x, actor->groundY, actor->posRot.pos.z, &sp60); @@ -47,9 +47,9 @@ void func_8002B200(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gfx* temp2 = (1.0f - (temp1 * (1.f / 350))) * actor->shape.unk_10; Matrix_Scale(actor->scale.x * temp2, 1.0f, actor->scale.z * temp2, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1588), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1588), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dlist); + gSPDisplayList(POLY_OPA_DISP++, dlist); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1594); } @@ -77,7 +77,7 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1661); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, (u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF); sp58 = Math_atan2f(light->l.dir[0], light->l.dir[2]); @@ -87,9 +87,9 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, Matrix_RotateY(sp58, MTXMODE_APPLY); Matrix_Scale(arg5, 1.0f, arg5 * arg6, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1687), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1687), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_04048180); + gSPDisplayList(POLY_OPA_DISP++, &D_04048180); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1693); } @@ -137,7 +137,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, Lights* lights, GlobalContext* OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1741); - oGfxCtx->polyOpa.p = Gfx_CallSetupDL(oGfxCtx->polyOpa.p, 0x2C); + POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); actor->shape.unk_15 = 0; for (i = 0; i < 2; i++) { @@ -359,7 +359,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z); if ((!(player->stateFlags1 & 0x40)) || (actor != player->unk_664)) { - oGfxCtx->overlay.p = Gfx_CallSetupDL(oGfxCtx->overlay.p, 0x39); + OVERLAY_DISP = Gfx_CallSetupDL(OVERLAY_DISP, 0x39); for (spB0 = 0, spAC = targetCtx->unk_4C; spB0 < spB8; spB0++, spAC = (spAC + 1) % 3) { entry = &targetCtx->arr_50[spAC]; @@ -374,7 +374,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Matrix_Translate(entry->pos.x, entry->pos.y, 0.0f, MTXMODE_NEW); Matrix_Scale(var2, 0.15f, 1.0f, MTXMODE_APPLY); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, entry->color.r, entry->color.g, entry->color.b, + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, entry->color.r, entry->color.g, entry->color.b, (u8)spCE); Matrix_RotateZ((targetCtx->unk_4B & 0x7F) * (M_PI / 64), MTXMODE_APPLY); @@ -383,9 +383,9 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY); Matrix_Push(); Matrix_Translate(entry->unk_0C, entry->unk_0C, 0.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116), + gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->overlay.p++, D_0404D450); + gSPDisplayList(OVERLAY_DISP++, D_0404D450); Matrix_Pull(); } } @@ -402,17 +402,17 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { if ((actor != NULL) && !(actor->flags & 0x8000000)) { NaviColor* naviColor = &sNaviColorList[actor->type]; - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x7); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x7); Matrix_Translate(actor->posRot2.pos.x, actor->posRot2.pos.y + (actor->unk_4C * actor->scale.y) + 17.0f, actor->posRot2.pos.z, MTXMODE_NEW); Matrix_RotateY((f32)((u16)(globalCtx->gameplayFrames * 3000)) * (M_PI / 32768), MTXMODE_APPLY); Matrix_Scale((iREG(27) + 35) / 1000.0f, (iREG(28) + 60) / 1000.0f, (iREG(29) + 50) / 1000.0f, MTXMODE_APPLY); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 255); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153), + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 255); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_0400CB70); + gSPDisplayList(POLY_XLU_DISP++, &D_0400CB70); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2158); @@ -732,26 +732,26 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { if (1) {} // Necessary to match - oGfxCtx->overlay.p = func_80093808(oGfxCtx->overlay.p); + OVERLAY_DISP = func_80093808(OVERLAY_DISP); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, (u8)titleCtx->unk_E, (u8)titleCtx->unk_E, (u8)titleCtx->unk_E, + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, (u8)titleCtx->unk_E, (u8)titleCtx->unk_E, (u8)titleCtx->unk_E, (u8)titleCtx->unk_C); - gDPLoadTextureBlock(oGfxCtx->overlay.p++, titleCtx->texture + spB0, G_IM_FMT_IA, G_IM_SIZ_8b, spCC, spC8, 0, + gDPLoadTextureBlock(OVERLAY_DISP++, titleCtx->texture + spB0, G_IM_FMT_IA, G_IM_SIZ_8b, spCC, spC8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, spC0, spB8, ((sp38 * 2) + spC0) - 4, spB8 + (spC8 * 4) - 1, + gSPTextureRectangle(OVERLAY_DISP++, spC0, spB8, ((sp38 * 2) + spC0) - 4, spB8 + (spC8 * 4) - 1, G_TX_RENDERTILE, 0, 0, 1024, 1024); spC8 = titleCtx->unk_9 - spC8; if (spC8 > 0) { - gDPLoadTextureBlock(oGfxCtx->overlay.p++, titleCtx->texture + spB0 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_8b, spCC, + gDPLoadTextureBlock(OVERLAY_DISP++, titleCtx->texture + spB0 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_8b, spCC, spC8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, spC0, spB4, ((sp38 * 2) + spC0) - 4, spB4 + (spC8 * 4) - 1, + gSPTextureRectangle(OVERLAY_DISP++, spC0, spB4, ((sp38 * 2) + spC0) - 4, spB4 + (spC8 * 4) - 1, G_TX_RENDERTILE, 0, 0, 1024, 1024); } @@ -1147,7 +1147,7 @@ u32 D_8015BBA4; s32 func_8002E2AC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3) { f32 sp34; - u32 sp30; + s32 sp30; arg2->y += 50.0f; @@ -1307,7 +1307,7 @@ Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContex OPEN_DISPS(gfxCtx, "../z_actor.c", 4306); - oGfxCtx->polyOpa.p = func_8002E830(object, eye, lightDir, gfxCtx, oGfxCtx->polyOpa.p, &hilite); + POLY_OPA_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_OPA_DISP, &hilite); CLOSE_DISPS(gfxCtx, "../z_actor.c", 4313); @@ -1319,7 +1319,7 @@ Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContex OPEN_DISPS(gfxCtx, "../z_actor.c", 4332); - oGfxCtx->polyXlu.p = func_8002E830(object, eye, lightDir, gfxCtx, oGfxCtx->polyXlu.p, &hilite); + POLY_XLU_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_XLU_DISP, &hilite); CLOSE_DISPS(gfxCtx, "../z_actor.c", 4339); @@ -1351,7 +1351,7 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); - gSPSegment(oGfxCtx->polyOpa.p++, 0x07, displayList); + gSPSegment(POLY_OPA_DISP++, 0x07, displayList); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 4394); } @@ -1377,7 +1377,7 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); - gSPSegment(oGfxCtx->polyXlu.p++, 0x07, displayList); + gSPSegment(POLY_XLU_DISP++, 0x07, displayList); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 4439); } @@ -1892,7 +1892,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { if ((globalCtx->csCtx.state == 0) && (gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex == gSaveContext.entranceIndex) && (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].roomIndex)) { - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x19); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x19); Matrix_Translate(gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8, @@ -1901,24 +1901,24 @@ void func_8002FBAC(GlobalContext* globalCtx) { Matrix_Mult(&globalCtx->mf_11D60, MTXMODE_APPLY); Matrix_Push(); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 200, spD0); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 100, 200, 0, 255); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 200, spD0); + gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 255); phi_f10 = (globalCtx->gameplayFrames * 1500) & 0xFFFF; Matrix_RotateZ((phi_f10 * M_PI) / 32768.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_04010130); + gSPDisplayList(POLY_XLU_DISP++, &D_04010130); Matrix_Pull(); phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF); Matrix_RotateZ((phi_f6 * M_PI) / 32768.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_04010130); + gSPDisplayList(POLY_XLU_DISP++, &D_04010130); } lightPos.x = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x; @@ -2179,8 +2179,8 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { Matrix_Scale(actor->scale.x, actor->scale.y, actor->scale.z, MTXMODE_APPLY); Actor_SetObjectDependency(globalCtx, actor); - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[actor->objBankIndex].segment); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, globalCtx->objectCtx.status[actor->objBankIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[actor->objBankIndex].segment); + gSPSegment(POLY_XLU_DISP++, 0x06, globalCtx->objectCtx.status[actor->objBankIndex].segment); if (actor->dmgEffectTimer != 0) { Color_RGBA8 sp2C = { 0, 0, 0, 255 }; @@ -2236,12 +2236,12 @@ void func_80030ED8(Actor* actor) { void func_80030FA8(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_actor.c", 6161); - gDPLoadTextureBlock(oGfxCtx->polyXlu.p++, &D_0401E370, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_MIRROR | G_TX_CLAMP, + gDPLoadTextureBlock(POLY_XLU_DISP++, &D_0401E370, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->polyXlu.p++, G_TX_RENDERTILE, 384, 224, 892, 732); - gSPTextureRectangle(oGfxCtx->polyXlu.p++, 0, 0, 1280, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPSetTileSize(POLY_XLU_DISP++, G_TX_RENDERTILE, 384, 224, 892, 732); + gSPTextureRectangle(POLY_XLU_DISP++, 0, 0, 1280, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597); + gDPPipeSync(POLY_XLU_DISP++); CLOSE_DISPS(gfxCtx, "../z_actor.c", 6183); } @@ -2256,67 +2256,67 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi OPEN_DISPS(gfxCtx, "../z_actor.c", 6197); // Translates to: "MAGIC LENS START" - gDPNoOpString(oGfxCtx->polyOpa.p++, "魔法のメガネ START", 0); + gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); if (globalCtx->roomCtx.curRoom.showInvisActors == 0) { - gDPSetOtherMode(oGfxCtx->polyXlu.p++, + gDPSetOtherMode(POLY_XLU_DISP++, G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_THRESHOLD | G_ZS_PRIM | Z_UPD | G_RM_CLD_SURF | G_RM_CLD_SURF2); - gDPSetCombineMode(oGfxCtx->polyXlu.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 0, 0, 255); + gDPSetCombineMode(POLY_XLU_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 0, 255); } else { - gDPSetOtherMode(oGfxCtx->polyXlu.p++, + gDPSetOtherMode(POLY_XLU_DISP++, G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_THRESHOLD | G_ZS_PRIM | Z_UPD | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_BL, G_BL_0, G_BL_CLR_MEM, G_BL_1MA) | GBL_c2(G_BL_CLR_BL, G_BL_0, G_BL_CLR_MEM, G_BL_1MA)); - gDPSetCombineLERP(oGfxCtx->polyXlu.p++, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, + gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0xFF, 74, 74, 74, 74); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0xFF, 74, 74, 74, 74); } - gDPSetPrimDepth(oGfxCtx->polyXlu.p++, 0, 0); + gDPSetPrimDepth(POLY_XLU_DISP++, 0, 0); func_80030FA8(gfxCtx); // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY START" - gDPNoOpString(oGfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", nbInvisibleActors); + gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", nbInvisibleActors); invisibleActor = &invisibleActors[0]; for (i = 0; i < nbInvisibleActors; i++) { // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY" - gDPNoOpString(oGfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示", i); + gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示", i); Actor_Draw(globalCtx, *(invisibleActor++)); } // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY END" - gDPNoOpString(oGfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", nbInvisibleActors); + gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", nbInvisibleActors); if (globalCtx->roomCtx.curRoom.showInvisActors != 0) { // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDPNoOpString(oGfxCtx->polyOpa.p++, "青い眼鏡(外側)", 0); + gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 0); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); - gDPSetOtherMode(oGfxCtx->polyXlu.p++, + gDPSetOtherMode(POLY_XLU_DISP++, G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_THRESHOLD | G_ZS_PRIM | G_RM_CLD_SURF | G_RM_CLD_SURF2); - gDPSetCombineMode(oGfxCtx->polyXlu.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 0, 0, 255); + gDPSetCombineMode(POLY_XLU_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 0, 255); func_80030FA8(gfxCtx); // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDPNoOpString(oGfxCtx->polyOpa.p++, "青い眼鏡(外側)", 1); + gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 1); } // Translates to: "MAGIC LENS END" - gDPNoOpString(oGfxCtx->polyOpa.p++, "魔法のメガネ END", 0); + gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); CLOSE_DISPS(gfxCtx, "../z_actor.c", 6284); } @@ -2361,8 +2361,8 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { ActorOverlay* overlayEntry = actor->overlayEntry; char* actorName = overlayEntry->name != NULL ? overlayEntry->name : ""; - gDPNoOpString(oGfxCtx->polyOpa.p++, actorName, i); - gDPNoOpString(oGfxCtx->polyXlu.p++, actorName, i); + gDPNoOpString(POLY_OPA_DISP++, actorName, i); + gDPNoOpString(POLY_XLU_DISP++, actorName, i); HREG(66) = i; @@ -3426,9 +3426,9 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) if (0) {} // Necessary to match - oGfxCtx->polyOpa.p = Gfx_CallSetupDL(oGfxCtx->polyOpa.p, 0x2C); + POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, alpha); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, alpha); sp50.x = arg0->x; sp50.y = arg0->y + 1.0f; @@ -3445,9 +3445,9 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) Matrix_Scale(arg1->x, 1.0f, arg1->z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8149), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8149), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_04049210); + gSPDisplayList(POLY_OPA_DISP++, &D_04049210); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8155); } @@ -3529,9 +3529,9 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) { Matrix_Scale(entry->unk_0C, entry->unk_0C, entry->unk_0C, MTXMODE_APPLY); } - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8299), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8299), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, entry->unk_14); + gSPDisplayList(POLY_OPA_DISP++, entry->unk_14); if (i % 2) { temp3 = entry->unk_00 + entry->unk_00; @@ -3545,9 +3545,9 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) { Matrix_Put(&spB0); Matrix_Scale(arg1 * 0.1f, arg1 * 0.1f, arg1 * 0.1f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8314), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8314), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, entry->unk_18); + gSPDisplayList(POLY_OPA_DISP++, entry->unk_18); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8319); } @@ -3801,14 +3801,14 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD func_80093D18(globalCtx->state.gfxCtx); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, alpha); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, func_80034B28(globalCtx->state.gfxCtx)); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, alpha); + gDPPipeSync(POLY_OPA_DISP++); + gSPSegment(POLY_OPA_DISP++, 0x0C, func_80034B28(globalCtx->state.gfxCtx)); - oGfxCtx->polyOpa.p = + POLY_OPA_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, - overrideLimbDraw, postLimbDraw, actor, oGfxCtx->polyOpa.p); + overrideLimbDraw, postLimbDraw, actor, POLY_OPA_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8860); } @@ -3819,13 +3819,13 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD func_80093D84(globalCtx->state.gfxCtx); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, alpha); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, func_80034B54(globalCtx->state.gfxCtx)); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, alpha); + gSPSegment(POLY_XLU_DISP++, 0x0C, func_80034B54(globalCtx->state.gfxCtx)); - oGfxCtx->polyXlu.p = + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, - overrideLimbDraw, postLimbDraw, actor, oGfxCtx->polyXlu.p); + overrideLimbDraw, postLimbDraw, actor, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8904); } diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.c index eb9ecfa53a..d611c08d2c 100644 --- a/src/code/z_cheap_proc.c +++ b/src/code/z_cheap_proc.c @@ -4,9 +4,9 @@ void Gfx_DrawDListOpa(GlobalContext* globalCtx, Gfx* dlist) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dlist); + gSPDisplayList(POLY_OPA_DISP++, dlist); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); } @@ -15,9 +15,9 @@ void Gfx_DrawDListXlu(GlobalContext* globalCtx, Gfx* dlist) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, dlist); + gSPDisplayList(POLY_XLU_DISP++, dlist); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); } diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 0ee403868b..91137e190e 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -223,9 +223,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_debug.c", 628); GfxPrint_Init(&gfxPrint); - sp78 = oGfxCtx->polyOpa.p; - tempRet = Graph_GfxPlusOne(oGfxCtx->polyOpa.p); - gSPDisplayList(oGfxCtx->overlay.p++, tempRet); + sp78 = POLY_OPA_DISP; + tempRet = Graph_GfxPlusOne(POLY_OPA_DISP); + gSPDisplayList(OVERLAY_DISP++, tempRet); GfxPrint_Open(&gfxPrint, tempRet); if ((OREG(0) == 1) || (OREG(0) == 8)) { @@ -240,7 +240,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) { sp7C = GfxPrint_Close(&gfxPrint); gSPEndDisplayList(sp7C++); Graph_BranchDlist(sp78, sp7C); - oGfxCtx->polyOpa.p = sp7C; + POLY_OPA_DISP = sp7C; if (0) {} diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 571bb82400..e802e9b8e3 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -74,19 +74,19 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalCont func_80094678(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); Matrix_Translate(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, MTXMODE_NEW); Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); Matrix_RotateRPY(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); - gDPLoadTextureBlock(oGfxCtx->polyXlu.p++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadTextureBlock(POLY_XLU_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_04004298); + gSPDisplayList(POLY_XLU_DISP++, &D_04004298); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 192); } @@ -96,16 +96,16 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext func_8009435C(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); - gSPSetLights1(oGfxCtx->polyXlu.p++, sDebugObjectLights); + gSPSetLights1(POLY_XLU_DISP++, sDebugObjectLights); func_800D1694(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, &dispObj->rot); Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, dlist); + gSPDisplayList(POLY_XLU_DISP++, dlist); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 231); } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 23f257b3e9..944203ffbc 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1861,13 +1861,13 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { if (BREG(0) != 0) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo.c", 4101); - prevDisplayList = oGfxCtx->polyOpa.p; - displayList = Graph_GfxPlusOne(oGfxCtx->polyOpa.p); - gSPDisplayList(oGfxCtx->overlay.p++, displayList); + prevDisplayList = POLY_OPA_DISP; + displayList = Graph_GfxPlusOne(POLY_OPA_DISP); + gSPDisplayList(OVERLAY_DISP++, displayList); Cutscene_DrawDebugInfo(globalCtx, &displayList, csCtx); gSPEndDisplayList(displayList++); Graph_BranchDlist(prevDisplayList, displayList); - oGfxCtx->polyOpa.p = displayList; + POLY_OPA_DISP = displayList; CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo.c", 4108); } diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 885a4674f4..c9ab4a2bf4 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -171,9 +171,9 @@ void func_800694E4(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 556); func_80093BA8(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 560), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 560), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 565); } @@ -183,10 +183,10 @@ void func_800695C0(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 572); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 5); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576), + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 581); } @@ -197,21 +197,21 @@ void func_8006969C(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 588); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 592), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 592), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), 0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1), 1 * -(globalCtx->state.frames * 8), 16, 32)); Matrix_Push(); Matrix_Translate(-8.0f, -2.0f, 0.0f, MTXMODE_APPLY); func_800D1FD4(&globalCtx->mf_11DA0); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 615), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 615), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); Matrix_Pull(); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 621); @@ -223,24 +223,24 @@ void func_80069880(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 628); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 632), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 632), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 641), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 641), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), 0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1), 1 * -(globalCtx->state.frames * 6), 16, 32)); Matrix_Push(); func_800D1FD4(&globalCtx->mf_11DA0); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 656), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 656), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); Matrix_Pull(); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 663); @@ -252,23 +252,23 @@ void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 670); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 674), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 674), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 683), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 683), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), 0 * (globalCtx->state.frames * 0), 32, 32, 1, 1 * (globalCtx->state.frames * 1), 1 * -(globalCtx->state.frames * 6), 32, 32)); Matrix_Push(); func_800D1FD4(&globalCtx->mf_11DA0); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); Matrix_Pull(); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 704); @@ -280,19 +280,19 @@ void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 712); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0) % 256, 1 * (globalCtx->state.frames * 2) % 256, 64, 64, 1, 0 * (globalCtx->state.frames * 0) % 128, 1 * (globalCtx->state.frames * 1) % 128, 32, 32)); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 723), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 723), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 730), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 730), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 735); } @@ -303,18 +303,18 @@ void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 742); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 746), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 746), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), 1 * -(globalCtx->state.frames * 5), 32, 32, 1, 0 * (globalCtx->state.frames * 0), 0 * (globalCtx->state.frames * 0), 32, 64)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 760), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 760), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 765); } @@ -325,10 +325,10 @@ void func_8006A060(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 772); func_80093BA8(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 776), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 776), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 783); } @@ -339,14 +339,14 @@ void func_8006A158(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 811); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 815), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 815), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 5); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 822), + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 822), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 827); } @@ -357,22 +357,22 @@ void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 834); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -1 * (globalCtx->state.frames * 1), 1 * (globalCtx->state.frames * 1), 32, 32, 1, -1 * (globalCtx->state.frames * 1), 1 * (globalCtx->state.frames * 1), 32, 32)); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 845), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 845), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 855), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 855), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[5]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[5]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 861); } @@ -383,13 +383,13 @@ void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 868); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 1), 0 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 1), 0 * (globalCtx->state.frames * 1), 32, 32)); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 878), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 878), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 883); } @@ -400,13 +400,13 @@ void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 890); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6), 1 * (globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 6), 1 * (globalCtx->state.frames * 6), 32, 32)); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 901), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 901), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 906); } @@ -417,13 +417,13 @@ void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 913); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 1), 1 * -(globalCtx->state.frames * 3), 32, 32, 1, 0 * (globalCtx->state.frames * 1), 1 * -(globalCtx->state.frames * 2), 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 924), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 924), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 929); } @@ -434,13 +434,13 @@ void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 936); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), 1 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 0), 1 * (globalCtx->state.frames * 1), 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 947), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 947), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 952); } @@ -451,9 +451,9 @@ void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 959); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 963), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 963), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 968); } @@ -464,14 +464,14 @@ void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 975); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 979), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 979), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 986), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 986), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 991); } @@ -482,10 +482,10 @@ void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 998); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1002), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1002), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1008); } @@ -496,15 +496,15 @@ void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1015); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1019), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1019), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1027), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1027), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1032); } @@ -515,15 +515,15 @@ void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1039); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1043), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1043), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1050), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1050), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1056); } @@ -534,15 +534,15 @@ void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1063); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), 1 * -(globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 1), -1 * (globalCtx->state.frames * 2), 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1074), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1074), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1081); } @@ -553,12 +553,12 @@ void func_8006B124(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1088); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1092), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1092), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1100); } @@ -569,16 +569,16 @@ void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1108); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1112), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1112), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1120), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1120), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1126); } @@ -591,16 +591,16 @@ void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1140), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1140), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1148), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1148), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1154); } @@ -611,16 +611,16 @@ void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1162); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), -1 * (globalCtx->state.frames * 2), 64, 64, 1, 1 * (globalCtx->state.frames * 4), 1 * -(globalCtx->state.frames * 4), 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1173), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1173), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1181); } @@ -631,17 +631,17 @@ void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1188); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1192), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1192), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1200), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1200), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1207); } @@ -652,16 +652,16 @@ void func_8006B870(GlobalContext* globalCtx, s16 drawId) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1214); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1218), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1218), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[4]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[5]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[6]); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[7]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[4]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[5]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[6]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[7]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1230); } diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 3624a2c9f8..ecc0290c40 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -399,7 +399,7 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3 void EffectBlure_SetupSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 809); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x26); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 813); } @@ -494,8 +494,8 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx[3].v.cn[2] = sp78.b; vtx[3].v.cn[3] = sp78.a; - gSPVertex(oGfxCtx->polyXlu.p++, vtx, 4, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 0, 1, 2, 0, 0, 2, 3, 0); + gSPVertex(POLY_XLU_DISP++, vtx, 4, 0); + gSP2Triangles(POLY_XLU_DISP++, 0, 1, 2, 0, 0, 2, 3, 0); } CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 932); @@ -668,14 +668,14 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem vtx[j2].v.cn[3] = func_80027E84(sp1A0.a, sp198.a, temp_f28); } - gSPVertex(oGfxCtx->polyXlu.p++, vtx, 16, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 0, 1, 3, 0, 0, 3, 2, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 2, 3, 5, 0, 2, 5, 4, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 4, 5, 7, 0, 4, 7, 6, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 6, 7, 9, 0, 6, 9, 8, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 8, 9, 11, 0, 8, 11, 10, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 10, 11, 13, 0, 10, 13, 12, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 12, 13, 15, 0, 12, 15, 14, 0); + gSPVertex(POLY_XLU_DISP++, vtx, 16, 0); + gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0); + gSP2Triangles(POLY_XLU_DISP++, 2, 3, 5, 0, 2, 5, 4, 0); + gSP2Triangles(POLY_XLU_DISP++, 4, 5, 7, 0, 4, 7, 6, 0); + gSP2Triangles(POLY_XLU_DISP++, 6, 7, 9, 0, 6, 9, 8, 0); + gSP2Triangles(POLY_XLU_DISP++, 8, 9, 11, 0, 8, 11, 10, 0); + gSP2Triangles(POLY_XLU_DISP++, 10, 11, 13, 0, 10, 13, 12, 0); + gSP2Triangles(POLY_XLU_DISP++, 12, 13, 15, 0, 12, 15, 14, 0); } CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1184); @@ -721,7 +721,7 @@ void EffectBlure_DrawSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { return; } - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); for (i = 0, elem = &this->elements[0]; elem < &this->elements[this->numElements - 1]; elem++, i++) { if ((elem->state == 0) || ((elem + 1)->state == 0)) { @@ -747,7 +747,7 @@ void EffectBlure_DrawSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1280); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x26); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1285); } @@ -755,24 +755,24 @@ void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vt void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1294); - gDPPipeSync(oGfxCtx->polyXlu.p++); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x26); + gDPPipeSync(POLY_XLU_DISP++); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); - gDPSetCycleType(oGfxCtx->polyXlu.p++, G_CYC_2CYCLE); - gDPSetTextureLUT(oGfxCtx->polyXlu.p++, G_TT_NONE); - gSPTexture(oGfxCtx->polyXlu.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCycleType(POLY_XLU_DISP++, G_CYC_2CYCLE); + gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE); + gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPLoadTextureBlock(oGfxCtx->polyXlu.p++, D_04006020, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, + gDPLoadTextureBlock(POLY_XLU_DISP++, D_04006020, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); - gDPSetCombineLERP(oGfxCtx->polyXlu.p++, TEXEL0, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL0, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED); - gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); - gSPClearGeometryMode(oGfxCtx->polyXlu.p++, G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); - gSPSetGeometryMode(oGfxCtx->polyXlu.p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); + gSPSetGeometryMode(POLY_XLU_DISP++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gDPPipeSync(POLY_XLU_DISP++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->altEnvColor.r, this->altEnvColor.g, this->altEnvColor.b, + gDPSetEnvColor(POLY_XLU_DISP++, this->altEnvColor.r, this->altEnvColor.g, this->altEnvColor.b, this->altEnvColor.a); CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1329); @@ -792,7 +792,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1356); sSetupHandlers[this->drawMode](gfxCtx, this, vtx); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); { Vec3f sp1B0; @@ -812,15 +812,15 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, for (i = 0; i < this->numElements - 1; i++) { if (this->drawMode == 1) { alphaRatio = (f32)this->elements[i].timer / (f32)this->elemDuration; - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x00, 0x80, this->altPrimColor.r, this->altPrimColor.g, + gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, this->altPrimColor.r, this->altPrimColor.g, this->altPrimColor.b, this->altPrimColor.a * (1.0f - alphaRatio)); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); } if (1) {} // Necessary to match - gSPVertex(oGfxCtx->polyXlu.p++, &vtx[j], 4, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 0, 1, 3, 0, 0, 3, 2, 0); + gSPVertex(POLY_XLU_DISP++, &vtx[j], 4, 0); + gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0); if (this->flags & 4) { sp1B0.x = ((f32)vtx[4 * i + 0].v.ob[0] + (f32)vtx[4 * i + 1].v.ob[0]) * 0.5f; @@ -850,10 +850,10 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, break; } - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPVertex(oGfxCtx->polyXlu.p++, &vtx[j], 4, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 0, 1, 3, 0, 0, 3, 2, 0); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(POLY_XLU_DISP++, &vtx[j], 4, 0); + gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } } @@ -993,12 +993,12 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1596); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->numElements != 0) { if (this->flags == 0) { func_800942F0(gfxCtx); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); vtx = Graph_Alloc(gfxCtx, sizeof(Vtx[32])); if (vtx == NULL) { @@ -1072,7 +1072,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { j = 0; - gSPVertex(oGfxCtx->polyXlu.p++, vtx, 32, 0); + gSPVertex(POLY_XLU_DISP++, vtx, 32, 0); phi_t2 = 0; for (i = 0; i < this->numElements; i++) { @@ -1084,7 +1084,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { if (phi_t2 == 0) { phi_t2 = 1; } else { - gSP1Quadrangle(oGfxCtx->polyXlu.p++, j - 2, j - 1, j + 1, j, 0); + gSP1Quadrangle(POLY_XLU_DISP++, j - 2, j - 1, j + 1, j, 0); if (1) {} // Necessary to match diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index a68c765612..43e73f6c9f 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -158,29 +158,29 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_eff_shield_particle.c", 272); if (this != NULL) { - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x26); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); - gDPSetCycleType(oGfxCtx->polyXlu.p++, G_CYC_2CYCLE); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPTexture(oGfxCtx->polyXlu.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCycleType(POLY_XLU_DISP++, G_CYC_2CYCLE); + gDPPipeSync(POLY_XLU_DISP++); + gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPLoadTextureBlock(oGfxCtx->polyXlu.p++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(POLY_XLU_DISP++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); if (1) {} // Necessary to match - gDPSetCombineLERP(oGfxCtx->polyXlu.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, + gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); - gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); - gSPClearGeometryMode(oGfxCtx->polyXlu.p++, + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); - gSPSetGeometryMode(oGfxCtx->polyXlu.p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPSetGeometryMode(POLY_XLU_DISP++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); EffectShieldParticle_GetColors(this, &primColor, &envColor); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, primColor.r, primColor.g, primColor.b, primColor.a); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, envColor.r, envColor.g, envColor.b, envColor.a); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, primColor.r, primColor.g, primColor.b, primColor.a); + gDPSetEnvColor(POLY_XLU_DISP++, envColor.r, envColor.g, envColor.b, envColor.a); + gDPPipeSync(POLY_XLU_DISP++); for (elem = &this->elements[0]; elem < &this->elements[this->numElements]; elem++) { Mtx* mtx; @@ -214,9 +214,9 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { break; } - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPVertex(oGfxCtx->polyXlu.p++, sVertices, 4, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 0, 1, 2, 0, 0, 3, 1, 0); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(POLY_XLU_DISP++, sVertices, 4, 0); + gSP2Triangles(POLY_XLU_DISP++, 0, 1, 2, 0, 0, 3, 1, 0); } } diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 6d4ef51ccc..7be59e286a 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -159,22 +159,22 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_eff_spark.c", 293); if (this != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x26); - gDPSetCycleType(oGfxCtx->polyXlu.p++, G_CYC_2CYCLE); - gDPPipeSync(oGfxCtx->polyXlu.p++); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); + gDPSetCycleType(POLY_XLU_DISP++, G_CYC_2CYCLE); + gDPPipeSync(POLY_XLU_DISP++); - gSPTexture(oGfxCtx->polyXlu.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPLoadTextureBlock(oGfxCtx->polyXlu.p++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPLoadTextureBlock(POLY_XLU_DISP++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - gDPSetCombineMode(oGfxCtx->polyXlu.p++, G_CC_SHADEDECALA, G_CC_PASS2); - gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); - gSPClearGeometryMode(oGfxCtx->polyXlu.p++, + gDPSetCombineMode(POLY_XLU_DISP++, G_CC_SHADEDECALA, G_CC_PASS2); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); - gSPSetGeometryMode(oGfxCtx->polyXlu.p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gSPSetGeometryMode(POLY_XLU_DISP++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gDPPipeSync(POLY_XLU_DISP++); vertices = Graph_Alloc(gfxCtx, this->numElements * sizeof(Vtx[4])); if (vertices == NULL) { @@ -271,12 +271,12 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { goto end; } - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPVertex(oGfxCtx->polyXlu.p++, &vertices[4 * i], 4, 0); - gSP2Triangles(oGfxCtx->polyXlu.p++, 2, 0, 3, 0, 2, 3, 1, 0); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(POLY_XLU_DISP++, &vertices[4 * i], 4, 0); + gSP2Triangles(POLY_XLU_DISP++, 2, 0, 3, 0, 2, 3, 1, 0); } - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); } end: diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index a6eeabeb86..9b5a552cb3 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -7,7 +7,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 113); - displayListHead = oGfxCtx->polyOpa.p; + displayListHead = POLY_OPA_DISP; cos = Math_Coss((0x8000 / arg3) * arg2); absCos = ABS(cos); @@ -21,7 +21,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a gSPFogPosition(displayListHead++, 0, (s16)(absCos * 3000.0f) + 1500); - oGfxCtx->polyOpa.p = displayListHead; + POLY_OPA_DISP = displayListHead; if (1) {} // Necessary to match @@ -36,13 +36,13 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 141); cos = Math_Coss((0x4000 / arg3) * arg2); - displayListHead = oGfxCtx->polyOpa.p; + displayListHead = POLY_OPA_DISP; gDPPipeSync(displayListHead++); gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); gSPFogPosition(displayListHead++, 0, (s16)(2800.0f * ABS(cos)) + 1700); - oGfxCtx->polyOpa.p = displayListHead; + POLY_OPA_DISP = displayListHead; if (1) {} // Necessary to match @@ -55,8 +55,8 @@ void func_80026608(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 159); - gDPPipeSync(oGfxCtx->polyOpa.p++); - oGfxCtx->polyOpa.p = func_800BC8A0(globalCtx, oGfxCtx->polyOpa.p); + gDPPipeSync(POLY_OPA_DISP++); + POLY_OPA_DISP = func_800BC8A0(globalCtx, POLY_OPA_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 164); } @@ -68,7 +68,7 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 178); - displayListHead = oGfxCtx->polyXlu.p; + displayListHead = POLY_XLU_DISP; cos = Math_Coss((0x8000 / arg3) * arg2); absCos = ABS(cos); @@ -82,7 +82,7 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a gSPFogPosition(displayListHead++, 0, (s16)(absCos * 3000.0f) + 1500); - oGfxCtx->polyXlu.p = displayListHead; + POLY_XLU_DISP = displayListHead; if (1) {} // Necessary to match @@ -95,14 +95,14 @@ void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 201); - displayListHead = oGfxCtx->polyXlu.p; + displayListHead = POLY_XLU_DISP; cos = Math_Coss((0x4000 / arg3) * arg2); gDPPipeSync(displayListHead++); gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); gSPFogPosition(displayListHead++, 0, (s16)(2800.0f * ABS(cos)) + 1700); - oGfxCtx->polyXlu.p = displayListHead; + POLY_XLU_DISP = displayListHead; if (1) {} // Necessary to match @@ -114,8 +114,8 @@ void func_80026A6C(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 217); - gDPPipeSync(oGfxCtx->polyXlu.p++); - oGfxCtx->polyXlu.p = func_800BC8A0(globalCtx, oGfxCtx->polyXlu.p); + gDPPipeSync(POLY_XLU_DISP++); + POLY_XLU_DISP = func_800BC8A0(globalCtx, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 222); } diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 806ee878a0..c987ab8f64 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -61,19 +61,19 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + gSPSegment(POLY_XLU_DISP++, 0x06, object); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(texture)); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(texture)); func_80094C50(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rgPrimColorR, this->rgPrimColorG, this->rgPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rgPrimColorR, this->rgPrimColorG, this->rgPrimColorB, this->rgPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rgEnvColorR, this->rgEnvColorG, this->rgEnvColorB, + gDPSetEnvColor(POLY_XLU_DISP++, this->rgEnvColorR, this->rgEnvColorG, this->rgEnvColorB, this->rgEnvColorA); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_effect_soft_sprite_old_init.c", 243); diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 34ca02864a..c23701d19c 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -329,12 +329,12 @@ void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) { } if (thisx->params == A_OBJ_KNOB) { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 1, 60, 60, 60, 50); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 1, 60, 60, 60, 50); } - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 712), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 712), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_80115484[type]); + gSPDisplayList(POLY_OPA_DISP++, D_80115484[type]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 715); } diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index df18eb7f79..1ae9c71c43 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,4 +1,5 @@ #include "global.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0x00000000 @@ -749,12 +750,12 @@ void func_8001EF30(EnItem00* this, GlobalContext* globalCtx) { } } - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1562), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1562), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80115530[iconNb])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80115530[iconNb])); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_04042440); + gSPDisplayList(POLY_OPA_DISP++, &D_04042440); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1568); } @@ -769,7 +770,7 @@ void func_8001F080(EnItem00* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1594); - oGfxCtx->polyOpa.p = func_800BC8A0(globalCtx, oGfxCtx->polyOpa.p); + POLY_OPA_DISP = func_800BC8A0(globalCtx, POLY_OPA_DISP); if (this->actor.params == ITEM00_BOMBS_SPECIAL) { iconNb = 1; @@ -777,13 +778,13 @@ void func_8001F080(EnItem00* this, GlobalContext* globalCtx) { iconNb -= 3; } - oGfxCtx->polyOpa.p = func_800946E4(oGfxCtx->polyOpa.p); + POLY_OPA_DISP = func_800946E4(POLY_OPA_DISP); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80115544[iconNb])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80115544[iconNb])); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_0403F070); + gSPDisplayList(POLY_OPA_DISP++, &D_0403F070); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1611); } @@ -798,15 +799,15 @@ void func_8001F1F4(EnItem00* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1634), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1634), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_0403BBA0); + gSPDisplayList(POLY_OPA_DISP++, &D_0403BBA0); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1644), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1644), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_0403BCD8); + gSPDisplayList(POLY_XLU_DISP++, &D_0403BCD8); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1647); } @@ -821,9 +822,9 @@ void func_8001F334(EnItem00* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1670), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1670), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_0403B030); + gSPDisplayList(POLY_XLU_DISP++, &D_0403B030); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1673); } @@ -876,7 +877,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 pa if (((params & 0x00FF) == ITEM00_FLEXIBLE) && !param4000) { // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf) spawnedActor = (EnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, - spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); + spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED); EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF, 40); } else { @@ -920,7 +921,7 @@ EnItem00* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 p if (((params & 0x00FF) == ITEM00_FLEXIBLE) && !param4000) { // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf) spawnedActor = (EnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, - spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); + spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED); EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF, 40); } else { @@ -990,7 +991,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 if (dropId == ITEM00_FLEXIBLE) { if (gSaveContext.health <= 0x10) { // 1 heart or less Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, - 0, 0, 0x0002); + 0, 0, FAIRY_HEAL_TIMED); EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF, 40); return; diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index e5aa09dd9f..c868525aad 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -135,27 +135,27 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* dList = limb->dList[0]; if (dList != NULL) { - gSPMatrix(oGfxCtx->polyOpa.p++, + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 321), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList); + gSPDisplayList(POLY_OPA_DISP++, dList); } } else if (lod == 1) { s32 pad2; dList = limb->dList[0]; if (dList != NULL) { - gSPMatrix(oGfxCtx->polyOpa.p++, + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 332), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList); + gSPDisplayList(POLY_OPA_DISP++, dList); } dList = limb->dList[1]; if (dList != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 338), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, dList); + gSPDisplayList(POLY_XLU_DISP++, dList); } } else { // FcSkeletonInfo_draw_child (): Not supported diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 104d6be425..c38eb11aa4 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -33,8 +33,8 @@ void Font_LoadOrderedFont(Font* font) { font->msgOffset = D_070380D4 - D_07000000; len = font->msgLength = D_0703811C - D_070380D4; - DmaMgr_SendRequest1(font->msgBuf, &_nes_message_data_staticSegmentRomStart[font->msgOffset], len, - "../z_kanfont.c", 122); + DmaMgr_SendRequest1(font->msgBuf, &_nes_message_data_staticSegmentRomStart[font->msgOffset], len, "../z_kanfont.c", + 122); osSyncPrintf("msg_data=%x, msg_data0=%x jj=%x\n", font->msgOffset, font->msgLength, jj = len); len = jj; for (fontBufIndex = 0, codePointIndex = 0; font->msgBuf[codePointIndex] != MESSAGE_END; codePointIndex++) { diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 63c5350088..b0c9db6199 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -221,37 +221,37 @@ void Health_Draw(GlobalContext* globalCtx) { if (i < fullHeartCount) { if (curColorSet != 0) { curColorSet = 0; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], interfaceCtx->unk_20E[4], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], + gDPSetEnvColor(OVERLAY_DISP++, interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], interfaceCtx->unk_21A[4], 0xFF); } } else if (i == fullHeartCount) { if (curColorSet != 1) { curColorSet = 1; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_202[0], interfaceCtx->unk_202[1], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, interfaceCtx->unk_202[0], interfaceCtx->unk_202[1], interfaceCtx->unk_202[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, interfaceCtx->unk_208[0], interfaceCtx->unk_208[1], + gDPSetEnvColor(OVERLAY_DISP++, interfaceCtx->unk_208[0], interfaceCtx->unk_208[1], interfaceCtx->unk_208[2], 0xFF); } } else if (i > fullHeartCount) { if (curColorSet != 2) { curColorSet = 2; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], interfaceCtx->unk_20E[4], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], + gDPSetEnvColor(OVERLAY_DISP++, interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], interfaceCtx->unk_21A[4], 0xFF); } } else { if (curColorSet != 3) { curColorSet = 3; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_20E[1], interfaceCtx->unk_20E[3], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, interfaceCtx->unk_20E[1], interfaceCtx->unk_20E[3], interfaceCtx->unk_20E[5], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, interfaceCtx->unk_21A[1], interfaceCtx->unk_21A[3], + gDPSetEnvColor(OVERLAY_DISP++, interfaceCtx->unk_21A[1], interfaceCtx->unk_21A[3], interfaceCtx->unk_21A[5], 0xFF); } } @@ -267,34 +267,34 @@ void Health_Draw(GlobalContext* globalCtx) { if (i < fullHeartCount) { if (curColorSet != 4) { curColorSet = 4; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, D_8015FDD0[0], D_8015FDD0[1], D_8015FDD0[2], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, D_8015FDD0[0], D_8015FDD0[1], D_8015FDD0[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, D_8015FDE0[0], D_8015FDE0[1], D_8015FDE0[2], 0xFF); + gDPSetEnvColor(OVERLAY_DISP++, D_8015FDE0[0], D_8015FDE0[1], D_8015FDE0[2], 0xFF); } } else if (i == fullHeartCount) { if (curColorSet != 5) { curColorSet = 5; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, D_8015FDC0[0], D_8015FDC0[1], D_8015FDC0[2], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, D_8015FDC0[0], D_8015FDC0[1], D_8015FDC0[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, D_8015FDC8[0], D_8015FDC8[1], D_8015FDC8[2], 0xFF); + gDPSetEnvColor(OVERLAY_DISP++, D_8015FDC8[0], D_8015FDC8[1], D_8015FDC8[2], 0xFF); } } else if (i > fullHeartCount) { if (curColorSet != 6) { curColorSet = 6; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, D_8015FDD0[0], D_8015FDD0[1], D_8015FDD0[2], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, D_8015FDD0[0], D_8015FDD0[1], D_8015FDD0[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, D_8015FDE0[0], D_8015FDE0[1], D_8015FDE0[2], 0xFF); + gDPSetEnvColor(OVERLAY_DISP++, D_8015FDE0[0], D_8015FDE0[1], D_8015FDE0[2], 0xFF); } } else { if (curColorSet != 7) { curColorSet = 7; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, D_8015FDD0[3], D_8015FDD0[4], D_8015FDD0[5], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, D_8015FDD0[3], D_8015FDD0[4], D_8015FDD0[5], interfaceCtx->healthAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, D_8015FDE0[3], D_8015FDE0[4], D_8015FDE0[5], 0xFF); + gDPSetEnvColor(OVERLAY_DISP++, D_8015FDE0[3], D_8015FDE0[4], D_8015FDE0[5], 0xFF); } } @@ -309,7 +309,7 @@ void Health_Draw(GlobalContext* globalCtx) { if (curBgImgLoaded != heartBgImg) { curBgImgLoaded = heartBgImg; - gDPLoadTextureBlock(oGfxCtx->overlay.p++, heartBgImg, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0, + gDPLoadTextureBlock(OVERLAY_DISP++, heartBgImg, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } @@ -319,7 +319,7 @@ void Health_Draw(GlobalContext* globalCtx) { if (curCombineModeSet != 1) { curCombineModeSet = 1; func_80094520(gfxCtx); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); } @@ -327,7 +327,7 @@ void Health_Draw(GlobalContext* globalCtx) { if (curCombineModeSet != 3) { curCombineModeSet = 3; func_80094520(gfxCtx); - gDPSetCombineLERP(oGfxCtx->overlay.p++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, + gDPSetCombineLERP(OVERLAY_DISP++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); } } @@ -339,7 +339,7 @@ void Health_Draw(GlobalContext* globalCtx) { temp4 *= 1024.0f; temp1 = 8.0f; temp1 *= 0.68f; - gSPTextureRectangle(oGfxCtx->overlay.p++, (s32)((temp2 - temp1) * 4), (s32)((temp3 - temp1) * 4), + gSPTextureRectangle(OVERLAY_DISP++, (s32)((temp2 - temp1) * 4), (s32)((temp3 - temp1) * 4), (s32)((temp2 + temp1) * 4), (s32)((temp3 + temp1) * 4), G_TX_RENDERTILE, 0, 0, (s32)temp4, (s32)temp4); } else { @@ -347,7 +347,7 @@ void Health_Draw(GlobalContext* globalCtx) { if (curCombineModeSet != 2) { curCombineModeSet = 2; func_80094A14(gfxCtx); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); } @@ -355,7 +355,7 @@ void Health_Draw(GlobalContext* globalCtx) { if (curCombineModeSet != 4) { curCombineModeSet = 4; func_80094A14(gfxCtx); - gDPSetCombineLERP(oGfxCtx->overlay.p++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, + gDPSetCombineLERP(OVERLAY_DISP++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); } } @@ -364,9 +364,9 @@ void Health_Draw(GlobalContext* globalCtx) { Mtx* matrix = Graph_Alloc(gfxCtx, sizeof(Mtx)); func_800D2CEC(matrix, 1.0f - (0.32f * sp144), 1.0f - (0.32f * sp144), 1.0f - (0.32f * sp144), -130.0f + offsetX, 94.5f - offsetY, 0.0f); - gSPMatrix(oGfxCtx->overlay.p++, matrix, G_MTX_MODELVIEW | G_MTX_LOAD); - gSPVertex(oGfxCtx->overlay.p++, sp154, 4, 0); - gSP1Quadrangle(oGfxCtx->overlay.p++, 0, 2, 3, 1, 0); + gSPMatrix(OVERLAY_DISP++, matrix, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPVertex(OVERLAY_DISP++, sp154, 4, 0); + gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); } } diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 2f6c06a62c..b140d8d579 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -60,24 +60,24 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_lights.c", 339); - gSPNumLights(oGfxCtx->polyOpa.p++, lights->numLights); - gSPNumLights(oGfxCtx->polyXlu.p++, lights->numLights); + gSPNumLights(POLY_OPA_DISP++, lights->numLights); + gSPNumLights(POLY_XLU_DISP++, lights->numLights); i = 0; light = &lights->l.l[0]; while (i < lights->numLights) { i++; - gSPLight(oGfxCtx->polyOpa.p++, light, i); - gSPLight(oGfxCtx->polyXlu.p++, light, i); + gSPLight(POLY_OPA_DISP++, light, i); + gSPLight(POLY_XLU_DISP++, light, i); light++; } if (0) {} i++; // abmient light is total number of lights + 1 - gSPLight(oGfxCtx->polyOpa.p++, &lights->l.a, i); - gSPLight(oGfxCtx->polyXlu.p++, &lights->l.a, i); + gSPLight(POLY_OPA_DISP++, &lights->l.a, i); + gSPLight(POLY_XLU_DISP++, &lights->l.a, i); CLOSE_DISPS(gfxCtx, "../z_lights.c", 352); } @@ -363,10 +363,10 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_lights.c", 887); - oGfxCtx->polyXlu.p = func_800947AC(oGfxCtx->polyXlu.p++); - gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_NOISE); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_MAGICSQ); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04015720); + POLY_XLU_DISP = func_800947AC(POLY_XLU_DISP++); + gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_MAGICSQ); + gSPDisplayList(POLY_XLU_DISP++, D_04015720); while (node != NULL) { LightInfo* info; @@ -380,12 +380,12 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { if ((info->type == LIGHT_POINT_GLOW) && (params->drawGlow)) { scale = SQ(params->radius) * 0.0000026f; - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, params->color[0], params->color[1], params->color[2], 50); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, params->color[0], params->color[1], params->color[2], 50); Matrix_Translate(params->x, params->y, params->z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_lights.c", 918), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_lights.c", 918), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04015760); + gSPDisplayList(POLY_XLU_DISP++, D_04015760); } node = node->next; diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 68e68e0f36..c9259e8da7 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -320,11 +320,11 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { if (globalCtx->interfaceCtx.minimapAlpha >= 0xAA) { func_80094A14(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->overlay.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + gSPMatrix(OVERLAY_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, 255); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); tempX = player->actor.posRot.pos.x; tempZ = player->actor.posRot.pos.z; @@ -335,11 +335,11 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { Matrix_RotateX(-1.6f, MTXMODE_APPLY); tempX = (0x7FFF - player->actor.shape.rot.y) / 0x400; Matrix_RotateY(tempX / 10.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 585), + gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 585), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 200, 255, 0, 255); - gSPDisplayList(oGfxCtx->overlay.p++, D_0400C820); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 200, 255, 0, 255); + gSPDisplayList(OVERLAY_DISP++, D_0400C820); tempX = sPlayerInitialPosX; tempZ = sPlayerInitialPosZ; @@ -349,11 +349,11 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { Matrix_Scale(VREG(9) / 100.0f, VREG(9) / 100.0f, VREG(9) / 100.0f, MTXMODE_APPLY); Matrix_RotateX(VREG(52) / 10.0f, MTXMODE_APPLY); Matrix_RotateY(sPlayerInitialDirection / 10.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 603), + gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 603), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0xFF, 200, 0, 0, 255); - gSPDisplayList(oGfxCtx->overlay.p++, D_0400C820); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0xFF, 200, 0, 0, 255); + gSPDisplayList(OVERLAY_DISP++, D_0400C820); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_map_exp.c", 607); @@ -380,17 +380,17 @@ void Minimap_Draw(GlobalContext* globalCtx) { case SCENE_ICE_DOUKUTO: if (!R_MINIMAP_TOGGLED) { func_80094520(globalCtx->state.gfxCtx); - gDPSetCombineLERP(oGfxCtx->overlay.p++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, + gDPSetCombineLERP(OVERLAY_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); if (gSaveContext.inventory.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 100, 255, 255, interfaceCtx->minimapAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 255, 255, interfaceCtx->minimapAlpha); - gDPLoadTextureBlock_4b(oGfxCtx->overlay.p++, interfaceCtx->mapSegment, G_IM_FMT_I, 96, 85, 0, + gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->mapSegment, G_IM_FMT_I, 96, 85, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_DGN_MINIMAP_X << 2, R_DGN_MINIMAP_Y << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_DGN_MINIMAP_X << 2, R_DGN_MINIMAP_Y << 2, (R_DGN_MINIMAP_X + 96) << 2, (R_DGN_MINIMAP_Y + 85) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); } @@ -437,16 +437,16 @@ void Minimap_Draw(GlobalContext* globalCtx) { if (!R_MINIMAP_TOGGLED) { func_80094520(globalCtx->state.gfxCtx); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_MINIMAP_COLOR(0), R_MINIMAP_COLOR(1), + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_MINIMAP_COLOR(0), R_MINIMAP_COLOR(1), R_MINIMAP_COLOR(2), interfaceCtx->minimapAlpha); - gDPLoadTextureBlock_4b(oGfxCtx->overlay.p++, interfaceCtx->mapSegment, G_IM_FMT_IA, + gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->mapSegment, G_IM_FMT_IA, gMapData->owMinimapWidth[mapIndex], gMapData->owMinimapHeight[mapIndex], 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_OW_MINIMAP_X << 2, R_OW_MINIMAP_Y << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_OW_MINIMAP_X << 2, R_OW_MINIMAP_Y << 2, (R_OW_MINIMAP_X + gMapData->owMinimapWidth[mapIndex]) << 2, (R_OW_MINIMAP_Y + gMapData->owMinimapHeight[mapIndex]) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); @@ -458,11 +458,11 @@ void Minimap_Draw(GlobalContext* globalCtx) { ((gMapData->owEntranceFlag[sEntranceIconMapIndex] != 0xFFFF) && (gSaveContext.infTable[26] & gBitFlags[gMapData->owEntranceFlag[mapIndex]]))) { - gDPLoadTextureBlock(oGfxCtx->overlay.p++, D_02002500, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 0, + gDPLoadTextureBlock(OVERLAY_DISP++, D_02002500, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, + gSPTextureRectangle(OVERLAY_DISP++, gMapData->owEntranceIconPosX[sEntranceIconMapIndex] << 2, gMapData->owEntranceIconPosY[sEntranceIconMapIndex] << 2, (gMapData->owEntranceIconPosX[sEntranceIconMapIndex] + 8) << 2, @@ -472,11 +472,11 @@ void Minimap_Draw(GlobalContext* globalCtx) { } if ((globalCtx->sceneNum == SCENE_SPOT08) && (gSaveContext.infTable[26] & gBitFlags[9])) { - gDPLoadTextureBlock(oGfxCtx->overlay.p++, D_02002500, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 0, + gDPLoadTextureBlock(OVERLAY_DISP++, D_02002500, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, 1080, 616, 1112, 648, G_TX_RENDERTILE, 0, 0, 1024, + gSPTextureRectangle(OVERLAY_DISP++, 1080, 616, 1112, 648, G_TX_RENDERTILE, 0, 0, 1024, 1024); } diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index c8e447f641..30752f531b 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -102,24 +102,24 @@ void MapMark_Draw(GlobalContext* globalCtx) { break; } - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTextureLUT(oGfxCtx->overlay.p++, G_TT_NONE); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->minimapAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, interfaceCtx->minimapAlpha); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTextureLUT(OVERLAY_DISP++, G_TT_NONE); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->minimapAlpha); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, interfaceCtx->minimapAlpha); markPoint = &mapMarkData->points[0]; for (i = 0; i < mapMarkData->count; i++) { if ((mapMarkData->markType != 0) || !Flags_GetTreasure(globalCtx, markPoint->chestFlag)) { markInfo = &sMapMarkInfoTable[mapMarkData->markType]; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPLoadTextureBlock(oGfxCtx->overlay.p++, markInfo->texture, markInfo->imageFormat, G_IM_SIZ_MARK, + gDPPipeSync(OVERLAY_DISP++); + gDPLoadTextureBlock(OVERLAY_DISP++, markInfo->texture, markInfo->imageFormat, G_IM_SIZ_MARK, markInfo->textureWidth, markInfo->textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); rectLeft = (GREG(94) + markPoint->x + 204) << 2; rectTop = (GREG(95) + markPoint->y + 140) << 2; - gSPTextureRectangle(oGfxCtx->overlay.p++, rectLeft, rectTop, markInfo->rectWidth + rectLeft, + gSPTextureRectangle(OVERLAY_DISP++, rectLeft, rectTop, markInfo->rectWidth + rectLeft, rectTop + markInfo->rectHeight, G_TX_RENDERTILE, 0, 0, markInfo->dsdx, markInfo->dtdy); } diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 42f5704bc8..3180c93774 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -45,11 +45,11 @@ void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) { } if (D_8015FFC0 != (arg1 & 3)) { - gDPLoadTLUT(oGfxCtx->polyOpa.p++, 16, 256, &gLetterTLUT[arg1 & 3]); + gDPLoadTLUT(POLY_OPA_DISP++, 16, 256, &gLetterTLUT[arg1 & 3]); D_8015FFC0 = arg1 & 3; } - gSPTextureRectangle(oGfxCtx->polyOpa.p++, D_80120120 << 2, D_80120124 << 2, (D_80120120 + 8) << 2, + gSPTextureRectangle(POLY_OPA_DISP++, D_80120120 << 2, D_80120124 << 2, (D_80120120 + 8) << 2, (D_80120124 + 8) << 2, G_TX_RENDERTILE, (u16)(arg1 & 4) * 64, (u16)(arg1 >> 3) * 256, 1024, 1024); @@ -65,18 +65,18 @@ void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) { osSyncPrintf("font_ff --> %X\n", gFontFF); } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, sFontColorRed, sFontColorGreen, sFontColorBlue, sFontColorAlpha); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sFontColorRed, sFontColorGreen, sFontColorBlue, sFontColorAlpha); - gDPSetTextureImage(oGfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_16b, 1, (s32)gFontFF); - gDPSetTile(oGfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_CI, G_IM_SIZ_16b, 1, (s32)gFontFF); + gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->polyOpa.p++); - gDPLoadBlock(oGfxCtx->polyOpa.p++, G_TX_LOADTILE, 0, 0, 511, 2048); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetTile(oGfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadSync(POLY_OPA_DISP++); + gDPLoadBlock(POLY_OPA_DISP++, G_TX_LOADTILE, 0, 0, 511, 2048); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->polyOpa.p++, G_TX_RENDERTILE, 0, 0, 60, 508); + gDPSetTileSize(POLY_OPA_DISP++, G_TX_RENDERTILE, 0, 0, 60, 508); D_8015FFC0 = -1; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 9f72fb8876..66e790bc8a 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1685,7 +1685,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return item; } else if (item == ITEM_MAGIC_SMALL) { if (gSaveContext.unk_13F0 != 10) { - func_80087680(globalCtx); + Magic_Fill(globalCtx); } func_80087708(globalCtx, 12, 5); @@ -1698,7 +1698,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return item; } else if (item == ITEM_MAGIC_LARGE) { if (gSaveContext.unk_13F0 != 10) { - func_80087680(globalCtx); + Magic_Fill(globalCtx); } func_80087708(globalCtx, 24, 5); @@ -2256,7 +2256,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { osSyncPrintf("合計 = (%d)\n", AMMO(item)); } -void func_80087680(GlobalContext* globalCtx) { +void Magic_Fill(GlobalContext* globalCtx) { if (gSaveContext.magicAcquired) { gSaveContext.unk_13F2 = gSaveContext.unk_13F0; gSaveContext.unk_13F6 = (gSaveContext.doubleMagic * 0x30) + 0x30; @@ -2560,65 +2560,65 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { func_80094520(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, sMagicBorderR, sMagicBorderG, sMagicBorderB, + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, sMagicBorderR, sMagicBorderG, sMagicBorderB, interfaceCtx->magicAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, 100, 50, 50, 255); + gDPSetEnvColor(OVERLAY_DISP++, 100, 50, 50, 255); - oGfxCtx->overlay.p = - Gfx_TextureIA8(oGfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024); + OVERLAY_DISP = + Gfx_TextureIA8(OVERLAY_DISP, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024); - oGfxCtx->overlay.p = Gfx_TextureIA8(oGfxCtx->overlay.p, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY, + OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY, gSaveContext.unk_13F4, 16, 1024, 1024); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_020038C0); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_020038C0); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 3, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 63, 2048); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 63, 2048); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 3, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 28, 60); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 28, 60); - gSPTextureRectangle(oGfxCtx->overlay.p++, ((R_MAGIC_BAR_X + gSaveContext.unk_13F4) + 8) << 2, magicBarY << 2, + gSPTextureRectangle(OVERLAY_DISP++, ((R_MAGIC_BAR_X + gSaveContext.unk_13F4) + 8) << 2, magicBarY << 2, ((R_MAGIC_BAR_X + gSaveContext.unk_13F4) + 16) << 2, (magicBarY + 16) << 2, G_TX_RENDERTILE, 256, 0, 1024, 1024); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, 255); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); if (gSaveContext.unk_13F0 == 4) { // Yellow part of the bar being used when casting a spell - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 250, 250, 0, interfaceCtx->magicAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 250, 250, 0, interfaceCtx->magicAlpha); - gDPLoadMultiBlock_4b(oGfxCtx->overlay.p++, D_02003AC0, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, + gDPLoadMultiBlock_4b(OVERLAY_DISP++, D_02003AC0, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2, (R_MAGIC_FILL_X + gSaveContext.magic) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); // Fill the rest of the bar with the normal magic color - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), R_MAGIC_FILL_COLOR(2), interfaceCtx->magicAlpha); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2, (R_MAGIC_FILL_X + gSaveContext.unk_13F8) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); } else { // Fill the whole bar with the normal magic color - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), R_MAGIC_FILL_COLOR(2), interfaceCtx->magicAlpha); - gDPLoadMultiBlock_4b(oGfxCtx->overlay.p++, D_02003AC0, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, + gDPLoadMultiBlock_4b(OVERLAY_DISP++, D_02003AC0, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2, (R_MAGIC_FILL_X + gSaveContext.magic) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); } @@ -2666,17 +2666,17 @@ void func_80088B34(s16 arg0) { void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { OPEN_DISPS(gfxCtx, "../z_parameter.c", 2820); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 191, 683); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 188, 60); - gSP1Quadrangle(oGfxCtx->overlay.p++, 0, 2, 3, 1, 0); + gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); CLOSE_DISPS(gfxCtx, "../z_parameter.c", 2829); } @@ -2698,69 +2698,69 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { // B Button Color & Texture // Also loads the Item Button Texture reused by other buttons afterwards - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), R_B_BTN_COLOR(2), + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), R_B_BTN_COLOR(2), interfaceCtx->bAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, 255); - oGfxCtx->overlay.p = - Gfx_TextureIA8(oGfxCtx->overlay.p, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0), + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); + OVERLAY_DISP = + Gfx_TextureIA8(OVERLAY_DISP, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0), R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_DD(0) * 2, R_ITEM_BTN_DD(0) * 2); // C-Left Button Color & Texture - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cLeftAlpha); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_ITEM_BTN_X(1) << 2, R_ITEM_BTN_Y(1) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_ITEM_BTN_X(1) << 2, R_ITEM_BTN_Y(1) << 2, (R_ITEM_BTN_X(1) + R_ITEM_BTN_WIDTH(1)) << 2, (R_ITEM_BTN_Y(1) + R_ITEM_BTN_WIDTH(1)) << 2, G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(1) * 2, R_ITEM_BTN_DD(1) * 2); // C-Down Button Color & Texture - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cDownAlpha); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_ITEM_BTN_X(2) << 2, R_ITEM_BTN_Y(2) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_ITEM_BTN_X(2) << 2, R_ITEM_BTN_Y(2) << 2, (R_ITEM_BTN_X(2) + R_ITEM_BTN_WIDTH(2)) << 2, (R_ITEM_BTN_Y(2) + R_ITEM_BTN_WIDTH(2)) << 2, G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(2) * 2, R_ITEM_BTN_DD(2) * 2); // C-Right Button Color & Texture - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cRightAlpha); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_ITEM_BTN_X(3) << 2, R_ITEM_BTN_Y(3) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_ITEM_BTN_X(3) << 2, R_ITEM_BTN_Y(3) << 2, (R_ITEM_BTN_X(3) + R_ITEM_BTN_WIDTH(3)) << 2, (R_ITEM_BTN_Y(3) + R_ITEM_BTN_WIDTH(3)) << 2, G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(3) * 2, R_ITEM_BTN_DD(3) * 2); if ((pauseCtx->state < 8) || (pauseCtx->state >= 18)) { if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { // Start Button Texture, Color & Label - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 120, 120, 120, interfaceCtx->startAlpha); - gSPTextureRectangle(oGfxCtx->overlay.p++, sStartButtonLeftPos[gSaveContext.language] << 2, 68, + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 120, 120, interfaceCtx->startAlpha); + gSPTextureRectangle(OVERLAY_DISP++, sStartButtonLeftPos[gSaveContext.language] << 2, 68, (sStartButtonLeftPos[gSaveContext.language] + 22) << 2, 156, G_TX_RENDERTILE, 0, 0, 1462, 1462); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->startAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, 0); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->startAlpha); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, (u32)interfaceCtx->do_actionSegment + 0x300); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 191, 683); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 188, 60); dxdy = 1024.0f / (R_START_LABEL_DD(gSaveContext.language) / 100.0f); width = 48.0f / (R_START_LABEL_DD(gSaveContext.language) / 100.0f); height = 16.0f / (R_START_LABEL_DD(gSaveContext.language) / 100.0f); gSPTextureRectangle( - oGfxCtx->overlay.p++, R_START_LABEL_X(gSaveContext.language) << 2, + OVERLAY_DISP++, R_START_LABEL_X(gSaveContext.language) << 2, R_START_LABEL_Y(gSaveContext.language) << 2, (R_START_LABEL_X(gSaveContext.language) + width) << 2, (R_START_LABEL_Y(gSaveContext.language) + height) << 2, G_TX_RENDERTILE, 0, 0, dxdy, dxdy); } @@ -2770,7 +2770,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { (globalCtx->csCtx.state == 0)) { if (!sCUpInvisible) { // C-Up Button Texture, Color & Label (Navi Text) - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); if ((gSaveContext.unk_13EA == 1) || (gSaveContext.unk_13EA == 2) || (gSaveContext.unk_13EA == 5)) { temp = 0; @@ -2781,30 +2781,30 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { temp = interfaceCtx->healthAlpha; } - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), temp); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_C_UP_BTN_X << 2, R_C_UP_BTN_Y << 2, (R_C_UP_BTN_X + 16) << 2, + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), temp); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gSPTextureRectangle(OVERLAY_DISP++, R_C_UP_BTN_X << 2, R_C_UP_BTN_Y << 2, (R_C_UP_BTN_X + 16) << 2, (R_C_UP_BTN_Y + 16) << 2, G_TX_RENDERTILE, 0, 0, 2048, 2048); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, temp); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, 0); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, temp); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, sCUpLabelTextures[gSaveContext.language]); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 63, 1024); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 2, 0, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 63, 1024); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_4b, 2, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 28); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 124, 28); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_C_UP_ICON_X << 2, R_C_UP_ICON_Y << 2, (R_C_UP_ICON_X + 32) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_C_UP_ICON_X << 2, R_C_UP_ICON_Y << 2, (R_C_UP_ICON_X + 32) << 2, (R_C_UP_ICON_Y + 8) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); } @@ -2815,24 +2815,24 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } } - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); // Empty C Button Arrows for (temp = 1; temp < 4; temp++) { if (gSaveContext.equips.buttonItems[temp] > 0xF0) { if (temp == 1) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cLeftAlpha); } else if (temp == 2) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cDownAlpha); } else { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cRightAlpha); } - oGfxCtx->overlay.p = Gfx_TextureIA8( - oGfxCtx->overlay.p, &D_02000A00[temp + 1], 0x20, 0x20, R_ITEM_BTN_X(temp), R_ITEM_BTN_Y(temp), + OVERLAY_DISP = Gfx_TextureIA8( + OVERLAY_DISP, &D_02000A00[temp + 1], 0x20, 0x20, R_ITEM_BTN_X(temp), R_ITEM_BTN_Y(temp), R_ITEM_BTN_WIDTH(temp), R_ITEM_BTN_WIDTH(temp), R_ITEM_BTN_DD(temp) * 2, R_ITEM_BTN_DD(temp) * 2); } } @@ -2843,11 +2843,11 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3079); - gDPLoadTextureBlock(oGfxCtx->overlay.p++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, + gDPLoadTextureBlock(OVERLAY_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_ITEM_ICON_X(button) << 2, R_ITEM_ICON_Y(button) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_ITEM_ICON_X(button) << 2, R_ITEM_ICON_Y(button) << 2, (R_ITEM_ICON_X(button) + R_ITEM_ICON_WIDTH(button)) << 2, (R_ITEM_ICON_Y(button) + R_ITEM_ICON_WIDTH(button)) << 2, G_TX_RENDERTILE, 0, 0, R_ITEM_ICON_DD(button) * 2, R_ITEM_ICON_DD(button) * 2); @@ -2873,7 +2873,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { ammo = AMMO(i); - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); if ((button == 0) && (gSaveContext.minigameState == 1)) { ammo = globalCtx->interfaceCtx.hbaAmmo; @@ -2890,11 +2890,11 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { ((i == ITEM_STICK) && (AMMO(i) == CUR_CAPACITY(UPG_STICKS))) || ((i == ITEM_NUT) && (AMMO(i) == CUR_CAPACITY(UPG_NUTS))) || ((i == ITEM_BOMBCHU) && (ammo == 50)) || ((i == ITEM_BEAN) && (ammo == 15))) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 120, 255, 0, alpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, alpha); } if (ammo == 0) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 100, 100, 100, alpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 100, 100, alpha); } for (i = 0; ammo >= 10; i++) { @@ -2902,11 +2902,11 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { } if (i != 0) { - oGfxCtx->overlay.p = Gfx_TextureIA8(oGfxCtx->overlay.p, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button), + OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button), R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); } - oGfxCtx->overlay.p = Gfx_TextureIA8(oGfxCtx->overlay.p, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6, + OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6, R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); } @@ -2924,15 +2924,15 @@ void Interface_DrawActionButton(GlobalContext* globalCtx) { if (1) {} // Necessary to match - gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3177), + gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3177), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPVertex(oGfxCtx->overlay.p++, interfaceCtx->vtx_128, 4, 0); + gSPVertex(OVERLAY_DISP++, interfaceCtx->vtx_128, 4, 0); - gDPLoadTextureBlock(oGfxCtx->overlay.p++, &D_02000A00[0], G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadTextureBlock(OVERLAY_DISP++, &D_02000A00[0], G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSP1Quadrangle(oGfxCtx->overlay.p++, 0, 2, 3, 1, 0); + gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3187); } @@ -3087,10 +3087,10 @@ void Interface_Draw(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3405); - gSPSegment(oGfxCtx->overlay.p++, 0x02, interfaceCtx->parameterSegment); - gSPSegment(oGfxCtx->overlay.p++, 0x07, interfaceCtx->do_actionSegment); - gSPSegment(oGfxCtx->overlay.p++, 0x08, interfaceCtx->icon_itemSegment); - gSPSegment(oGfxCtx->overlay.p++, 0x0B, interfaceCtx->mapSegment); + gSPSegment(OVERLAY_DISP++, 0x02, interfaceCtx->parameterSegment); + gSPSegment(OVERLAY_DISP++, 0x07, interfaceCtx->do_actionSegment); + gSPSegment(OVERLAY_DISP++, 0x08, interfaceCtx->icon_itemSegment); + gSPSegment(OVERLAY_DISP++, 0x0B, interfaceCtx->mapSegment); if (pauseCtx->flag == 0) { Interface_InitVertices(globalCtx); @@ -3100,9 +3100,9 @@ void Interface_Draw(GlobalContext* globalCtx) { func_80094520(globalCtx->state.gfxCtx); // Rupee Icon - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 200, 255, 100, interfaceCtx->magicAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 80, 0, 255); - oGfxCtx->overlay.p = Gfx_TextureIA8(oGfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 200, 255, 100, interfaceCtx->magicAlpha); + gDPSetEnvColor(OVERLAY_DISP++, 0, 80, 0, 255); + OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024); switch (globalCtx->sceneNum) { case SCENE_BMORI1: @@ -3121,16 +3121,16 @@ void Interface_Draw(GlobalContext* globalCtx) { case SCENE_TAKARAYA: if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] >= 0) { // Small Key Icon - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 200, 230, 255, interfaceCtx->magicAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 20, 255); - oGfxCtx->overlay.p = - Gfx_TextureIA8(oGfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024); + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 200, 230, 255, interfaceCtx->magicAlpha); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 20, 255); + OVERLAY_DISP = + Gfx_TextureIA8(OVERLAY_DISP, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024); // Small Key Counter - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha); - gDPSetCombineLERP(oGfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha); + gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); interfaceCtx->counterDigits[2] = 0; @@ -3143,13 +3143,13 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s2 = 42; if (interfaceCtx->counterDigits[2] != 0) { - oGfxCtx->overlay.p = - Gfx_TextureI8(oGfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16, + OVERLAY_DISP = + Gfx_TextureI8(OVERLAY_DISP, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16, phi_s2, 190, 8, 16, 1024, 1024); phi_s2 = 50; } - oGfxCtx->overlay.p = Gfx_TextureI8(oGfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[3]], + OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, &D_02003040[interfaceCtx->counterDigits[3]], 8, 16, phi_s2, 190, 8, 16, 1024, 1024); } @@ -3163,17 +3163,17 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s2 = 42; // Rupee Counter - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 120, 255, 0, interfaceCtx->magicAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, interfaceCtx->magicAlpha); } else if (gSaveContext.rupees != 0) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha); } else { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 100, 100, 100, interfaceCtx->magicAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 100, 100, interfaceCtx->magicAlpha); } - gDPSetCombineLERP(oGfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, + gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); interfaceCtx->counterDigits[0] = interfaceCtx->counterDigits[1] = 0; @@ -3197,7 +3197,7 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s1 = sRupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)]; for (phi_s3 = 0; phi_s3 < phi_s1; phi_s3++, phi_s0++, phi_s2 += 8) { - oGfxCtx->overlay.p = Gfx_TextureI8(oGfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8, + OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8, 16, phi_s2, 206, 8, 16, 1024, 1024); } @@ -3212,9 +3212,9 @@ void Interface_Draw(GlobalContext* globalCtx) { Interface_DrawItemButtons(globalCtx); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); if (interfaceCtx->unk_1FA == 0) { // B Button Icon & possibly Ammo Count @@ -3223,8 +3223,8 @@ void Interface_Draw(GlobalContext* globalCtx) { if ((player->stateFlags1 & 0x00800000) || (globalCtx->unk_11E5C >= 2) || ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) { - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); Interface_DrawAmmoCount(globalCtx, 0, interfaceCtx->bAlpha); @@ -3232,66 +3232,66 @@ void Interface_Draw(GlobalContext* globalCtx) { } } else { // B Button Do Action Label - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, (u32)interfaceCtx->do_actionSegment + 0x180); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 191, 683); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 188, 60); R_B_LABEL_DD = 1024.0f / (WREG(37 + gSaveContext.language) / 100.0f); - gSPTextureRectangle(oGfxCtx->overlay.p++, R_B_LABEL_X(gSaveContext.language) << 2, + gSPTextureRectangle(OVERLAY_DISP++, R_B_LABEL_X(gSaveContext.language) << 2, R_B_LABEL_Y(gSaveContext.language) << 2, (R_B_LABEL_X(gSaveContext.language) + 48) << 2, (R_B_LABEL_Y(gSaveContext.language) + 16) << 2, G_TX_RENDERTILE, 0, 0, R_B_LABEL_DD, R_B_LABEL_DD); } - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); // C-Left Button Icon & Ammo Count if (gSaveContext.equips.buttonItems[1] < 0xF0) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cLeftAlpha); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->cLeftAlpha); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), 1); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); Interface_DrawAmmoCount(globalCtx, 1, interfaceCtx->cLeftAlpha); } - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); // C-Down Button Icon & Ammo Count if (gSaveContext.equips.buttonItems[2] < 0xF0) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cDownAlpha); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->cDownAlpha); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), 2); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); Interface_DrawAmmoCount(globalCtx, 2, interfaceCtx->cDownAlpha); } - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); // C-Right Button Icon & Ammo Count if (gSaveContext.equips.buttonItems[3] < 0xF0) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cRightAlpha); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->cRightAlpha); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), 3); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); Interface_DrawAmmoCount(globalCtx, 3, interfaceCtx->cRightAlpha); } @@ -3299,24 +3299,24 @@ void Interface_Draw(GlobalContext* globalCtx) { // A Button func_80094A14(globalCtx->state.gfxCtx); func_8008A8B8(globalCtx, R_A_BTN_Y, R_A_BTN_Y + 45, R_A_BTN_X, R_A_BTN_X + 45); - gSPClearGeometryMode(oGfxCtx->overlay.p++, G_CULL_BOTH); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, R_A_BTN_COLOR(0), R_A_BTN_COLOR(1), R_A_BTN_COLOR(2), + gSPClearGeometryMode(OVERLAY_DISP++, G_CULL_BOTH); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_A_BTN_COLOR(0), R_A_BTN_COLOR(1), R_A_BTN_COLOR(2), interfaceCtx->aAlpha); Interface_DrawActionButton(globalCtx); - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); func_8008A8B8(globalCtx, R_A_ICON_Y, R_A_ICON_Y + 45, R_A_ICON_X, R_A_ICON_X + 45); - gSPSetGeometryMode(oGfxCtx->overlay.p++, G_CULL_BACK); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + gSPSetGeometryMode(OVERLAY_DISP++, G_CULL_BACK); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, 0); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0); Matrix_Translate(0.0f, 0.0f, WREG(46 + gSaveContext.language) / 10.0f, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3701), + gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3701), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPVertex(oGfxCtx->overlay.p++, &interfaceCtx->vtx_128[4], 4, 0); + gSPVertex(OVERLAY_DISP++, &interfaceCtx->vtx_128[4], 4, 0); if ((interfaceCtx->unk_1EC < 2) || (interfaceCtx->unk_1EC == 3)) { Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)(u32)interfaceCtx->do_actionSegment); @@ -3324,16 +3324,16 @@ void Interface_Draw(GlobalContext* globalCtx) { Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)((u32)interfaceCtx->do_actionSegment + 0x180)); } - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); func_8008A994(interfaceCtx); if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 3)) { // Inventory Equip Effects - gSPSegment(oGfxCtx->overlay.p++, 0x08, pauseCtx->unk_128); + gSPSegment(OVERLAY_DISP++, 0x08, pauseCtx->unk_128); func_80094A14(globalCtx->state.gfxCtx); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gSPMatrix(oGfxCtx->overlay.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gSPMatrix(OVERLAY_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); pauseCtx->vtx_168[16].v.ob[0] = pauseCtx->vtx_168[18].v.ob[0] = pauseCtx->unk_254 / 10; pauseCtx->vtx_168[17].v.ob[0] = pauseCtx->vtx_168[19].v.ob[0] = @@ -3344,24 +3344,24 @@ void Interface_Draw(GlobalContext* globalCtx) { if (pauseCtx->unk_24E < 0xBF) { // Normal Equip (icon goes from the inventory slot to the C button when equipping it) - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, pauseCtx->unk_258); - gSPVertex(oGfxCtx->overlay.p++, &pauseCtx->vtx_168[16], 4, 0); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, pauseCtx->unk_258); + gSPVertex(OVERLAY_DISP++, &pauseCtx->vtx_168[16], 4, 0); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, gItemIcons[pauseCtx->unk_24E]); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0, 0x0000, G_TX_LOADTILE, 0, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, gItemIcons[pauseCtx->unk_24E]); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 1023, 128); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 1023, 128); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 124); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 124, 124); } else { // Magic Arrow Equip Effect phi_s3_2 = pauseCtx->unk_24E - 0xBF; - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, sMagicArrowEffectsR[phi_s3_2], + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, sMagicArrowEffectsR[phi_s3_2], sMagicArrowEffectsG[phi_s3_2], sMagicArrowEffectsB[phi_s3_2], pauseCtx->unk_258); if ((pauseCtx->unk_258 > 0) && (pauseCtx->unk_258 < 0xFF)) { @@ -3376,21 +3376,21 @@ void Interface_Draw(GlobalContext* globalCtx) { pauseCtx->vtx_168[16].v.ob[1] - phi_s3_2 * 2 - 32; } - gSPVertex(oGfxCtx->overlay.p++, &pauseCtx->vtx_168[16], 4, 0); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_080895C0); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, + gSPVertex(OVERLAY_DISP++, &pauseCtx->vtx_168[16], 4, 0); + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_080895C0); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 511, 512); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 511, 512); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 124); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 124, 124); } - gSP1Quadrangle(oGfxCtx->overlay.p++, 0, 2, 3, 1, 0); + gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); } func_80094520(globalCtx->state.gfxCtx); @@ -3400,29 +3400,29 @@ void Interface_Draw(GlobalContext* globalCtx) { // Carrots rendering if the action corresponds to riding a horse if (interfaceCtx->unk_1EE == 8) { // Load Carrot Icon - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, &D_02002100); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0, 0x0000, G_TX_LOADTILE, 0, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, &D_02002100); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 255, 256); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 4, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 255, 256); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 60, 60); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 60, 60); // Draw 6 carrots phi_s1 = ZREG(14); for (phi_s3 = 1; phi_s3 < 7; phi_s3++) { // Carrot Color (based on availability) if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 0, 150, 255, interfaceCtx->aAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 150, 255, interfaceCtx->aAlpha); } else { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha); } - gSPTextureRectangle(oGfxCtx->overlay.p++, phi_s1 << 2, ZREG(15) << 2, (phi_s1 + 16) << 2, + gSPTextureRectangle(OVERLAY_DISP++, phi_s1 << 2, ZREG(15) << 2, (phi_s1 + 16) << 2, (ZREG(15) + 16) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); phi_s1 += 16; @@ -3430,42 +3430,42 @@ void Interface_Draw(GlobalContext* globalCtx) { } } else { // Score for the Horseback Archery - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); // Target Icon - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_02002600); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_02002600); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadBlock(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 383, 342); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 6, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 383, 342); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 6, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 92, 60); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 92, 60); - gSPTextureRectangle(oGfxCtx->overlay.p++, (WREG(32) + 28) << 2, ZREG(15) << 2, (WREG(32) + 52) << 2, + gSPTextureRectangle(OVERLAY_DISP++, (WREG(32) + 28) << 2, ZREG(15) << 2, (WREG(32) + 52) << 2, (ZREG(15) + 16) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); // Score Counter - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); phi_s0 = 0; phi_s1 = WREG(32) + 6 * 9; for (phi_s3 = 0; phi_s3 < 4; phi_s3++) { if (sHBAScoreDigits[phi_s3] != 0 || (phi_s0 != 0) || (phi_s3 >= 3)) { - oGfxCtx->overlay.p = - Gfx_TextureI8(oGfxCtx->overlay.p, &D_02003040[sHBAScoreDigits[phi_s3]], 8, 16, phi_s1, + OVERLAY_DISP = + Gfx_TextureI8(OVERLAY_DISP, &D_02003040[sHBAScoreDigits[phi_s3]], 8, 16, phi_s1, ZREG(15) - 2, sDigitWidth[0], VREG(42), VREG(43) * 2, VREG(43) * 2); phi_s1 += 9; phi_s0++; } } - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); } } @@ -3846,32 +3846,32 @@ void Interface_Draw(GlobalContext* globalCtx) { } // Clock Icon - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, 255); - gDPSetEnvColor(oGfxCtx->overlay.p++, 0, 0, 0, 0); - oGfxCtx->overlay.p = Gfx_TextureIA8(oGfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timerX[sp274], + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0); + OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, D_02002000, 16, 16, gSaveContext.timerX[sp274], gSaveContext.timerY[sp274] + 2, 16, 16, 1024, 1024); // Timer Counter - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCombineMode(oGfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPPipeSync(OVERLAY_DISP++); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); if (gSaveContext.timer1State != 0) { if ((gSaveContext.timer1Value < 10) && (gSaveContext.timer1State < 11)) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 50, 0, 255); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255); } else { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 255, 255); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255); } } else { if ((gSaveContext.timer2Value < 10) && (gSaveContext.timer2State < 6)) { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 50, 0, 255); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255); } else { - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 255, 255, 0, 255); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 0, 255); } } for (phi_s3 = 0; phi_s3 < 5; phi_s3++) { - oGfxCtx->overlay.p = Gfx_TextureI8(oGfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16, + OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, &D_02003040[sTimerDigits[phi_s3]], 8, 16, gSaveContext.timerX[sp274] + sTimerDigitLeftPos[phi_s3], gSaveContext.timerY[sp274], sDigitWidth[phi_s3], VREG(42), VREG(43) * 2, VREG(43) * 2); @@ -3885,10 +3885,10 @@ void Interface_Draw(GlobalContext* globalCtx) { } if (interfaceCtx->unk_244 != 0) { - gDPPipeSync(oGfxCtx->overlay.p++); - gSPDisplayList(oGfxCtx->overlay.p++, sSetupDL_80125A60); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 0, 0, 0, interfaceCtx->unk_244); - gDPFillRectangle(oGfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); + gDPPipeSync(OVERLAY_DISP++); + gSPDisplayList(OVERLAY_DISP++, sSetupDL_80125A60); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 0, 0, interfaceCtx->unk_244); + gDPFillRectangle(OVERLAY_DISP++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 4269); diff --git a/src/code/z_play.c b/src/code/z_play.c index e9d964f7e0..87caa61b57 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1080,27 +1080,27 @@ void Gameplay_Draw(GlobalContext* globalCtx) { gSegments[5] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); gSegments[2] = VIRTUAL_TO_PHYSICAL(globalCtx->sceneSegment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); - gSPSegment(oGfxCtx->polyXlu.p++, 0x00, NULL); - gSPSegment(oGfxCtx->overlay.p++, 0x00, NULL); + gSPSegment(POLY_OPA_DISP++, 0x00, NULL); + gSPSegment(POLY_XLU_DISP++, 0x00, NULL); + gSPSegment(OVERLAY_DISP++, 0x00, NULL); - gSPSegment(oGfxCtx->polyOpa.p++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); - gSPSegment(oGfxCtx->polyXlu.p++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); - gSPSegment(oGfxCtx->overlay.p++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + gSPSegment(POLY_XLU_DISP++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + gSPSegment(OVERLAY_DISP++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); - gSPSegment(oGfxCtx->polyXlu.p++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); - gSPSegment(oGfxCtx->overlay.p++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + gSPSegment(POLY_XLU_DISP++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + gSPSegment(OVERLAY_DISP++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x02, globalCtx->sceneSegment); - gSPSegment(oGfxCtx->polyXlu.p++, 0x02, globalCtx->sceneSegment); - gSPSegment(oGfxCtx->overlay.p++, 0x02, globalCtx->sceneSegment); + gSPSegment(POLY_OPA_DISP++, 0x02, globalCtx->sceneSegment); + gSPSegment(POLY_XLU_DISP++, 0x02, globalCtx->sceneSegment); + gSPSegment(OVERLAY_DISP++, 0x02, globalCtx->sceneSegment); func_80095248(gfxCtx, 0, 0, 0); if ((HREG(80) != 10) || (HREG(82) != 0)) { - oGfxCtx->polyOpa.p = func_800BC8A0(globalCtx, oGfxCtx->polyOpa.p); - oGfxCtx->polyXlu.p = func_800BC8A0(globalCtx, oGfxCtx->polyXlu.p); + POLY_OPA_DISP = func_800BC8A0(globalCtx, POLY_OPA_DISP); + POLY_XLU_DISP = func_800BC8A0(globalCtx, POLY_XLU_DISP); func_800AA460(&globalCtx->view, globalCtx->view.fovy, globalCtx->view.zNear, globalCtx->lightCtx.unk_0C); func_800AAA50(&globalCtx->view, 15); @@ -1120,12 +1120,12 @@ void Gameplay_Draw(GlobalContext* globalCtx) { globalCtx->unk_11DE0 = Matrix_MtxFToMtx(Matrix_CheckFloats(&globalCtx->mf_11DA0, "../z_play.c", 4005), Graph_Alloc(gfxCtx, sizeof(Mtx))); - gSPSegment(oGfxCtx->polyOpa.p++, 0x01, globalCtx->unk_11DE0); + gSPSegment(POLY_OPA_DISP++, 0x01, globalCtx->unk_11DE0); if ((HREG(80) != 10) || (HREG(92) != 0)) { - Gfx* sp1CC = oGfxCtx->polyOpa.p; - Gfx* gfxP = Graph_GfxPlusOne(oGfxCtx->polyOpa.p); - gSPDisplayList(oGfxCtx->overlay.p++, gfxP); + Gfx* sp1CC = POLY_OPA_DISP; + Gfx* gfxP = Graph_GfxPlusOne(POLY_OPA_DISP); + gSPDisplayList(OVERLAY_DISP++, gfxP); if ((globalCtx->transitionMode == 3) || (globalCtx->transitionMode == 11) || (globalCtx->transitionCtx.transitionType >= 56)) { @@ -1149,13 +1149,13 @@ void Gameplay_Draw(GlobalContext* globalCtx) { gSPEndDisplayList(gfxP++); Graph_BranchDlist(sp1CC, gfxP); - oGfxCtx->polyOpa.p = gfxP; + POLY_OPA_DISP = gfxP; } if (gTrnsnUnkState == 3) { - Gfx* sp88 = oGfxCtx->polyOpa.p; + Gfx* sp88 = POLY_OPA_DISP; TransitionUnk_Draw(&sTrnsnUnk, &sp88); - oGfxCtx->polyOpa.p = sp88; + POLY_OPA_DISP = sp88; goto Gameplay_Draw_DrawOverlayElements; } else { PreRender_SetValues(&globalCtx->preRenderCtx, SCREEN_WIDTH, SCREEN_HEIGHT, gfxCtx->curFrameBuffer, @@ -1170,9 +1170,9 @@ void Gameplay_Draw(GlobalContext* globalCtx) { } if (R_PAUSE_MENU_MODE == 3) { - Gfx* sp84 = oGfxCtx->polyOpa.p; + Gfx* sp84 = POLY_OPA_DISP; func_800C24BC(&globalCtx->preRenderCtx, &sp84); - oGfxCtx->polyOpa.p = sp84; + POLY_OPA_DISP = sp84; goto Gameplay_Draw_DrawOverlayElements; } else { s32 sp80; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index e5a87bb78b..ff187883c3 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -638,16 +638,16 @@ void func_8008F470(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbDraw eyeIndex = sEyeMouthIndexes[face][0]; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[eyeIndex])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[eyeIndex])); if (mouthIndex < 0) { mouthIndex = sEyeMouthIndexes[face][1]; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[mouthIndex])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[mouthIndex])); color = &sTunicColors[tunic]; - gDPSetEnvColor(oGfxCtx->polyOpa.p++, color->r, color->g, color->b, 0); + gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0); sDListsLodOffset = lod * 2; @@ -658,25 +658,25 @@ void func_8008F470(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbDraw s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH); if (strengthUpgrade >= PLAYER_STR_SILVER_G) { - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPPipeSync(POLY_OPA_DISP++); color = &sGauntletColors[strengthUpgrade - PLAYER_STR_SILVER_G]; - gDPSetEnvColor(oGfxCtx->polyOpa.p++, color->r, color->g, color->b, 0); + gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06025218); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06025598); - gSPDisplayList(oGfxCtx->polyOpa.p++, (D_80160014 == 0) ? D_060252D8 : D_06025438); - gSPDisplayList(oGfxCtx->polyOpa.p++, (D_80160018 == 8) ? D_06025658 : D_060257B8); + gSPDisplayList(POLY_OPA_DISP++, D_06025218); + gSPDisplayList(POLY_OPA_DISP++, D_06025598); + gSPDisplayList(POLY_OPA_DISP++, (D_80160014 == 0) ? D_060252D8 : D_06025438); + gSPDisplayList(POLY_OPA_DISP++, (D_80160018 == 8) ? D_06025658 : D_060257B8); } if (boots != 0) { Gfx** bootDLists = sBootDListGroups[boots - 1]; - gSPDisplayList(oGfxCtx->polyOpa.p++, bootDLists[0]); - gSPDisplayList(oGfxCtx->polyOpa.p++, bootDLists[1]); + gSPDisplayList(POLY_OPA_DISP++, bootDLists[0]); + gSPDisplayList(POLY_OPA_DISP++, bootDLists[1]); } } else { if (Player_GetStrength() > PLAYER_STR_NONE) { - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06016118); + gSPDisplayList(POLY_OPA_DISP++, D_06016118); } } } @@ -1031,8 +1031,8 @@ void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPo gSegments[6] = VIRTUAL_TO_PHYSICAL(this->giObjectSegment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, this->giObjectSegment); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, this->giObjectSegment); + gSPSegment(POLY_OPA_DISP++, 0x06, this->giObjectSegment); + gSPSegment(POLY_XLU_DISP++, 0x06, this->giObjectSegment); Matrix_Translate(refPos->x + (3.3f * Math_Sins(this->actor.shape.rot.y)), refPos->y + height, refPos->z + ((3.3f + (IREG(90) / 10.0f)) * Math_Coss(this->actor.shape.rot.y)), MTXMODE_NEW); @@ -1088,7 +1088,7 @@ void func_80090AFC(GlobalContext* globalCtx, Player* this, f32 arg2) { if (func_8003E188(&globalCtx->colCtx, &sp8C, &sp80, &sp74, &sp9C, 1, 1, 1, 1, &sp98) != 0) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2572); - oGfxCtx->overlay.p = Gfx_CallSetupDL(oGfxCtx->overlay.p, 0x07); + OVERLAY_DISP = Gfx_CallSetupDL(OVERLAY_DISP, 0x07); SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &sp74, &sp68, &sp64); @@ -1097,10 +1097,10 @@ void func_80090AFC(GlobalContext* globalCtx, Player* this, f32 arg2) { Matrix_Translate(sp74.x, sp74.y, sp74.z, MTXMODE_NEW); Matrix_Scale(sp60, sp60, sp60, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2587), + gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2587), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->overlay.p++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); - gSPDisplayList(oGfxCtx->overlay.p++, D_0602CB48); + gSPSegment(OVERLAY_DISP++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); + gSPDisplayList(OVERLAY_DISP++, D_0602CB48); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2592); } @@ -1186,9 +1186,9 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* Matrix_RotateRPY(-0x8000, 0, 0x4000, MTXMODE_APPLY); Matrix_Scale(1.0f, this->unk_85C, 1.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2653), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2653), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06006CC0); + gSPDisplayList(POLY_OPA_DISP++, D_06006CC0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2656); } else if ((this->actor.scale.y >= 0.0f) && (this->swordState != 0)) { @@ -1207,10 +1207,10 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2710); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2712), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2712), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, bottleColor->r, bottleColor->g, bottleColor->b, 0); - gSPDisplayList(oGfxCtx->polyXlu.p++, sBottleDLists[gSaveContext.linkAge]); + gDPSetEnvColor(POLY_XLU_DISP++, bottleColor->r, bottleColor->g, bottleColor->b, 0); + gSPDisplayList(POLY_XLU_DISP++, sBottleDLists[gSaveContext.linkAge]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2717); } @@ -1280,9 +1280,9 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* Matrix_RotateZ(this->unk_858 * -0.2f, MTXMODE_APPLY); } - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2804), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2804), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, stringData->dList); + gSPDisplayList(POLY_XLU_DISP++, stringData->dList); Matrix_Pull(); @@ -1440,60 +1440,60 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, struct_80 { s32 pad[2]; } - opaRef = oGfxCtx->polyOpa.p; - oGfxCtx->polyOpa.p++; + opaRef = POLY_OPA_DISP; + POLY_OPA_DISP++; - xluRef = oGfxCtx->polyXlu.p; - oGfxCtx->polyXlu.p++; + xluRef = POLY_XLU_DISP; + POLY_XLU_DISP++; - gSPDisplayList(oGfxCtx->work.p++, oGfxCtx->polyOpa.p); - gSPDisplayList(oGfxCtx->work.p++, oGfxCtx->polyXlu.p); + gSPDisplayList(WORK_DISP++, POLY_OPA_DISP); + gSPDisplayList(WORK_DISP++, POLY_XLU_DISP); - gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(POLY_OPA_DISP++, 0x00, NULL); - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPPipeSync(POLY_OPA_DISP++); - gSPLoadGeometryMode(oGfxCtx->polyOpa.p++, 0); - gSPTexture(oGfxCtx->polyOpa.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); - gDPSetCombineMode(oGfxCtx->polyOpa.p++, G_CC_SHADE, G_CC_SHADE); - gDPSetOtherMode(oGfxCtx->polyOpa.p++, + gSPLoadGeometryMode(POLY_OPA_DISP++, 0); + gSPTexture(POLY_OPA_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); + gDPSetCombineMode(POLY_OPA_DISP++, G_CC_SHADE, G_CC_SHADE); + gDPSetOtherMode(POLY_OPA_DISP++, G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_FILL | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2); - gSPLoadGeometryMode(oGfxCtx->polyOpa.p++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH); - gDPSetScissorFrac(oGfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, width * 4.0f, height * 4.0f); - gSPClipRatio(oGfxCtx->polyOpa.p++, FRUSTRATIO_1); + gSPLoadGeometryMode(POLY_OPA_DISP++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH); + gDPSetScissorFrac(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, width * 4.0f, height * 4.0f); + gSPClipRatio(POLY_OPA_DISP++, FRUSTRATIO_1); - gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, img2); - gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL); - gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); - gDPSetFillColor(oGfxCtx->polyOpa.p++, (GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0)); - gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, 0, width - 1, height - 1); + gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, img2); + gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0)); + gDPFillRectangle(POLY_OPA_DISP++, 0, 0, width - 1, height - 1); - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPPipeSync(POLY_OPA_DISP++); - gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, img1); - gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL); - gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); - gDPSetFillColor(oGfxCtx->polyOpa.p++, (GPACK_RGBA5551(0, 0, 0, 1) << 16) | GPACK_RGBA5551(0, 0, 0, 1)); - gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, 0, width - 1, height - 1); + gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, img1); + gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(0, 0, 0, 1) << 16) | GPACK_RGBA5551(0, 0, 0, 1)); + gDPFillRectangle(POLY_OPA_DISP++, 0, 0, width - 1, height - 1); - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPPipeSync(POLY_OPA_DISP++); - gDPSetDepthImage(oGfxCtx->polyOpa.p++, img2); + gDPSetDepthImage(POLY_OPA_DISP++, img2); viewport.vp.vscale[0] = viewport.vp.vtrans[0] = width * 2; viewport.vp.vscale[1] = viewport.vp.vtrans[1] = height * 2; - gSPViewport(oGfxCtx->polyOpa.p++, &viewport); + gSPViewport(POLY_OPA_DISP++, &viewport); guPerspective(perspMtx, &perspNorm, fovy, (f32)width / (f32)height, 10.0f, 4000.0f, 1.0f); - gSPPerspNormalize(oGfxCtx->polyOpa.p++, perspNorm); - gSPMatrix(oGfxCtx->polyOpa.p++, perspMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPPerspNormalize(POLY_OPA_DISP++, perspNorm); + gSPMatrix(POLY_OPA_DISP++, perspMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(lookAtMtx, eye->x, eye->y, eye->z, at->x, at->y, at->z, 0.0f, 1.0f, 0.0f); - gSPMatrix(oGfxCtx->polyOpa.p++, lookAtMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPMatrix(POLY_OPA_DISP++, lookAtMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); sp12C[0] = sword; sp12C[1] = shield; @@ -1501,27 +1501,27 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, struct_80 func_800D1694(pos->x, pos->y, pos->z, rot); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPSegment(oGfxCtx->polyOpa.p++, 0x04, seg04); - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, seg06); + gSPSegment(POLY_OPA_DISP++, 0x04, seg04); + gSPSegment(POLY_OPA_DISP++, 0x06, seg06); - gSPSetLights1(oGfxCtx->polyOpa.p++, lights1); + gSPSetLights1(POLY_OPA_DISP++, lights1); func_80093C80(globalCtx); - oGfxCtx->polyOpa.p = Gfx_SetFog2(oGfxCtx->polyOpa.p++, 0, 0, 0, 0, 997, 1000); + POLY_OPA_DISP = Gfx_SetFog2(POLY_OPA_DISP++, 0, 0, 0, 0, 997, 1000); func_8002EABC(pos, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, gCullBackDList); + gSPSegment(POLY_OPA_DISP++, 0x0C, gCullBackDList); func_8008F470(globalCtx, arg3->skeleton, arg3->limbDrawTable, arg3->dListCount, 0, tunic, boots, 0, func_80091880, NULL, &sp12C); - gSPEndDisplayList(oGfxCtx->polyOpa.p++); - gSPEndDisplayList(oGfxCtx->polyXlu.p++); + gSPEndDisplayList(POLY_OPA_DISP++); + gSPEndDisplayList(POLY_XLU_DISP++); - gSPBranchList(opaRef, oGfxCtx->polyOpa.p); - gSPBranchList(xluRef, oGfxCtx->polyXlu.p); + gSPBranchList(opaRef, POLY_OPA_DISP); + gSPBranchList(xluRef, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 3288); } diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 985b1d3f2b..0a4ed75fbb 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -30,11 +30,11 @@ void PreNMI_Draw(PreNMIContext* this) { OPEN_DISPS(gfxCtx, "../z_prenmi.c", 96); - gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); func_800940B0(gfxCtx); - gDPSetFillColor(oGfxCtx->polyOpa.p++, (GPACK_RGBA5551(255, 255, 255, 1) << 16) | GPACK_RGBA5551(255, 255, 255, 1)); - gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, this->timer + 100, SCREEN_WIDTH - 1, this->timer + 100); + gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(255, 255, 255, 1) << 16) | GPACK_RGBA5551(255, 255, 255, 1)); + gDPFillRectangle(POLY_OPA_DISP++, 0, this->timer + 100, SCREEN_WIDTH - 1, this->timer + 100); CLOSE_DISPS(gfxCtx, "../z_prenmi.c", 112); } diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 7af688f2e9..241b1596c9 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -858,7 +858,7 @@ Gfx* func_80093808(Gfx* gfx) { void func_80093848(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1293); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3A]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x3A]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1297); } @@ -866,7 +866,7 @@ void func_80093848(GraphicsContext* gfxCtx) { void func_800938B4(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1309); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x39]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x39]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1313); } @@ -874,7 +874,7 @@ void func_800938B4(GraphicsContext* gfxCtx) { void func_80093920(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1325); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x32]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x32]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1329); } @@ -882,7 +882,7 @@ void func_80093920(GraphicsContext* gfxCtx) { void func_8009398C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1341); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x33]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x33]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1345); } @@ -890,7 +890,7 @@ void func_8009398C(GraphicsContext* gfxCtx) { void func_800939F8(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1357); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x34]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x34]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1361); } @@ -898,7 +898,7 @@ void func_800939F8(GraphicsContext* gfxCtx) { void func_80093A64(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1373); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x35]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x35]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1377); } @@ -906,7 +906,7 @@ void func_80093A64(GraphicsContext* gfxCtx) { void func_80093AD0(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1389); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x36]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x36]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1393); } @@ -914,7 +914,7 @@ void func_80093AD0(GraphicsContext* gfxCtx) { void func_80093B3C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1405); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x37]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x37]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1409); } @@ -922,7 +922,7 @@ void func_80093B3C(GraphicsContext* gfxCtx) { void func_80093BA8(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1421); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1A]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x1A]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1425); } @@ -930,7 +930,7 @@ void func_80093BA8(GraphicsContext* gfxCtx) { void func_80093C14(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1439); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x19]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1443); } @@ -943,7 +943,7 @@ void func_80093C80(GlobalContext* globalCtx) { if (globalCtx->roomCtx.curRoom.unk_03 == 3) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1460); - gDPSetColorDither(oGfxCtx->polyOpa.p++, G_CD_DISABLE); + gDPSetColorDither(POLY_OPA_DISP++, G_CD_DISABLE); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1462); } @@ -952,7 +952,7 @@ void func_80093C80(GlobalContext* globalCtx) { void func_80093D18(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1475); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x19]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x19]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1479); } @@ -960,7 +960,7 @@ void func_80093D18(GraphicsContext* gfxCtx) { void func_80093D84(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1491); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x19]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1495); } @@ -968,7 +968,7 @@ void func_80093D84(GraphicsContext* gfxCtx) { void func_80093DF0(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1507); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1F]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x1F]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1511); } @@ -976,7 +976,7 @@ void func_80093DF0(GraphicsContext* gfxCtx) { void func_80093E5C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1523); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x20]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x20]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1527); } @@ -984,7 +984,7 @@ void func_80093E5C(GraphicsContext* gfxCtx) { void func_80093EC8(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1539); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x21]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x21]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1543); } @@ -1002,7 +1002,7 @@ Gfx* func_80093F58(Gfx* gfx) { void func_80093F7C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1569); - oGfxCtx->polyOpa.p = func_80093F58(oGfxCtx->polyOpa.p); + POLY_OPA_DISP = func_80093F58(POLY_OPA_DISP); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1573); } @@ -1010,7 +1010,7 @@ void func_80093F7C(GraphicsContext* gfxCtx) { void func_80093FD8(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1585); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x23]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x23]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1589); } @@ -1018,7 +1018,7 @@ void func_80093FD8(GraphicsContext* gfxCtx) { void func_80094044(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1601); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2C]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x2C]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1605); } @@ -1026,7 +1026,7 @@ void func_80094044(GraphicsContext* gfxCtx) { void func_800940B0(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1617); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x24]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x24]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1621); } @@ -1039,7 +1039,7 @@ Gfx* func_8009411C(Gfx* gfx) { void func_80094140(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1640); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1C]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x1C]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1644); } @@ -1047,7 +1047,7 @@ void func_80094140(GraphicsContext* gfxCtx) { void func_800941AC(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1651); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2B]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x2B]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1655); } @@ -1055,7 +1055,7 @@ void func_800941AC(GraphicsContext* gfxCtx) { void func_80094218(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1670); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2D]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x2D]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1674); } @@ -1063,7 +1063,7 @@ void func_80094218(GraphicsContext* gfxCtx) { void func_80094284(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1681); - gSPDisplayList(oGfxCtx->overlay.p++, &sSetupDL[6 * 0x2E]); + gSPDisplayList(OVERLAY_DISP++, &sSetupDL[6 * 0x2E]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1685); } @@ -1071,7 +1071,7 @@ void func_80094284(GraphicsContext* gfxCtx) { void func_800942F0(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1700); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x26]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x26]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1704); } @@ -1079,7 +1079,7 @@ void func_800942F0(GraphicsContext* gfxCtx) { void func_8009435C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1722); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x04]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x04]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1726); } @@ -1087,7 +1087,7 @@ void func_8009435C(GraphicsContext* gfxCtx) { void func_800943C8(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1758); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x25]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x25]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1762); } @@ -1095,7 +1095,7 @@ void func_800943C8(GraphicsContext* gfxCtx) { void func_80094434(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1775); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x02]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x02]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1779); } @@ -1108,7 +1108,7 @@ Gfx* func_800944A0(Gfx* gfx) { void func_800944C4(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1799); - oGfxCtx->polyOpa.p = func_800944A0(oGfxCtx->polyOpa.p); + POLY_OPA_DISP = func_800944A0(POLY_OPA_DISP); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1801); } @@ -1116,7 +1116,7 @@ void func_800944C4(GraphicsContext* gfxCtx) { void func_80094520(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1809); - oGfxCtx->overlay.p = func_800944A0(oGfxCtx->overlay.p); + OVERLAY_DISP = func_800944A0(OVERLAY_DISP); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1811); } @@ -1130,7 +1130,7 @@ void func_8009457C(Gfx** gfxp) { void func_800945A0(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1837); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x28]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x28]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1841); } @@ -1138,7 +1138,7 @@ void func_800945A0(GraphicsContext* gfxCtx) { void func_8009460C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1853); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x29]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x29]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1857); } @@ -1146,7 +1146,7 @@ void func_8009460C(GraphicsContext* gfxCtx) { void func_80094678(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1869); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2F]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x2F]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1873); } @@ -1210,7 +1210,7 @@ Gfx* func_80094968(Gfx* gfx) { void func_800949A8(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1953); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2A]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x2A]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1957); } @@ -1218,7 +1218,7 @@ void func_800949A8(GraphicsContext* gfxCtx) { void func_80094A14(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1964); - gSPDisplayList(oGfxCtx->overlay.p++, &sSetupDL[6 * 0x2A]); + gSPDisplayList(OVERLAY_DISP++, &sSetupDL[6 * 0x2A]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1968); } @@ -1226,7 +1226,7 @@ void func_80094A14(GraphicsContext* gfxCtx) { void func_80094A80(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 1992); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x30]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x30]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1996); } @@ -1234,7 +1234,7 @@ void func_80094A80(GraphicsContext* gfxCtx) { void func_80094AEC(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2008); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x31]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x31]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2012); } @@ -1242,7 +1242,7 @@ void func_80094AEC(GraphicsContext* gfxCtx) { void func_80094B58(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2024); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x1B]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x1B]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2028); } @@ -1250,8 +1250,8 @@ void func_80094B58(GraphicsContext* gfxCtx) { void func_80094BC4(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2040); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3C]); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_DISABLE); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x3C]); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2043); } @@ -1259,7 +1259,7 @@ void func_80094BC4(GraphicsContext* gfxCtx) { void func_80094C50(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2056); - gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3D]); + gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x3D]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2058); } @@ -1267,7 +1267,7 @@ void func_80094C50(GraphicsContext* gfxCtx) { void func_80094CBC(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2086); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x38]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x38]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2090); } @@ -1283,7 +1283,7 @@ void func_80094D28(Gfx** gfxp) { void func_80094D4C(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2112); - gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3B]); + gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x3B]); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2116); } @@ -1368,22 +1368,22 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) { void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2386); - gSPDisplayList(oGfxCtx->polyOpa.p++, sFillSetupDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, sFillSetupDL); - gSPDisplayList(oGfxCtx->overlay.p++, sFillSetupDL); + gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL); + gSPDisplayList(POLY_XLU_DISP++, sFillSetupDL); + gSPDisplayList(OVERLAY_DISP++, sFillSetupDL); - gDPSetScissorFrac(oGfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); - gDPSetScissorFrac(oGfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); - gDPSetScissorFrac(oGfxCtx->overlay.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); + gDPSetScissorFrac(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); + gDPSetScissorFrac(POLY_XLU_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); + gDPSetScissorFrac(OVERLAY_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); - gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - gDPSetColorImage(oGfxCtx->polyXlu.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - gDPSetColorImage(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(POLY_XLU_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - gDPSetDepthImage(oGfxCtx->polyOpa.p++, gZBuffer); - gDPSetDepthImage(oGfxCtx->polyXlu.p++, gZBuffer); - gDPSetDepthImage(oGfxCtx->overlay.p++, gZBuffer); + gDPSetDepthImage(POLY_OPA_DISP++, gZBuffer); + gDPSetDepthImage(POLY_XLU_DISP++, gZBuffer); + gDPSetDepthImage(OVERLAY_DISP++, gZBuffer); if ((R_PAUSE_MENU_MODE < 2) && (gTrnsnUnkState < 2)) { s32 ret = ShrinkWindow_GetCurrentVal(); @@ -1428,29 +1428,29 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { } } - gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gZBuffer); - gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL); - gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); - gDPSetFillColor(oGfxCtx->polyOpa.p++, + gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gZBuffer); + gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0)); - gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPFillRectangle(POLY_OPA_DISP++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); + gDPPipeSync(POLY_OPA_DISP++); - gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL); - gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); - gDPSetFillColor(oGfxCtx->polyOpa.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); - gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); + gDPFillRectangle(POLY_OPA_DISP++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); + gDPPipeSync(POLY_OPA_DISP++); if (ret > 0) { - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetCycleType(oGfxCtx->overlay.p++, G_CYC_FILL); - gDPSetRenderMode(oGfxCtx->overlay.p++, G_RM_NOOP, G_RM_NOOP2); - gDPSetFillColor(oGfxCtx->overlay.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); - gDPFillRectangle(oGfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, ret - 1); - gDPFillRectangle(oGfxCtx->overlay.p++, 0, gScreenHeight - ret, gScreenWidth - 1, gScreenHeight - 1); - gDPPipeSync(oGfxCtx->overlay.p++); + gDPPipeSync(OVERLAY_DISP++); + gDPSetCycleType(OVERLAY_DISP++, G_CYC_FILL); + gDPSetRenderMode(OVERLAY_DISP++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(OVERLAY_DISP++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); + gDPFillRectangle(OVERLAY_DISP++, 0, 0, gScreenWidth - 1, ret - 1); + gDPFillRectangle(OVERLAY_DISP++, 0, gScreenHeight - ret, gScreenWidth - 1, gScreenHeight - 1); + gDPPipeSync(OVERLAY_DISP++); } } @@ -1460,10 +1460,10 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { void func_80095974(GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_rcp.c", 2503); - gSPDisplayList(oGfxCtx->polyOpa.p++, sFillSetupDL); - gDPSetScissorFrac(oGfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); - gDPSetDepthImage(oGfxCtx->polyOpa.p++, gZBuffer); - gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL); + gDPSetScissorFrac(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); + gDPSetDepthImage(POLY_OPA_DISP++, gZBuffer); + gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2513); } diff --git a/src/code/z_room.c b/src/code/z_room.c index a959890136..2a18f9b9c3 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -41,27 +41,27 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x03, room->segment); + gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); func_80093C80(globalCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } if (flags & 2) { func_8003435C(&D_801270A0, globalCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x03, room->segment); + gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } polygon0 = &room->mesh->polygon0; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon0->start); for (i = 0; i < polygon0->num; i++) { if ((flags & 1) && (polygonDlist->opa != NULL)) { - gSPDisplayList(oGfxCtx->polyOpa.p++, polygonDlist->opa); + gSPDisplayList(POLY_OPA_DISP++, polygonDlist->opa); } if ((flags & 2) && (polygonDlist->xlu != NULL)) { - gSPDisplayList(oGfxCtx->polyXlu.p++, polygonDlist->xlu); + gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu); } polygonDlist++; @@ -108,16 +108,16 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x03, room->segment); + gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); func_80093C80(globalCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } if (flags & 2) { func_8003435C(&D_801270A0, globalCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x03, room->segment); + gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } spA4 = &spB8[0]; @@ -193,20 +193,20 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { if (((iREG(86) == 1) && (iREG(89) > sp9C)) || ((iREG(86) == 2) && (iREG(89) == sp9C))) { if ((flags & 1) && (phi_s0->opa != NULL)) { - gSPDisplayList(oGfxCtx->polyOpa.p++, phi_s0->opa); + gSPDisplayList(POLY_OPA_DISP++, phi_s0->opa); } if ((flags & 2) && (phi_s0->xlu != NULL)) { - gSPDisplayList(oGfxCtx->polyXlu.p++, phi_s0->xlu); + gSPDisplayList(POLY_XLU_DISP++, phi_s0->xlu); } } } else { if ((flags & 1) && (phi_s0->opa != NULL)) { - gSPDisplayList(oGfxCtx->polyOpa.p++, phi_s0->opa); + gSPDisplayList(POLY_OPA_DISP++, phi_s0->opa); } if ((flags & 2) && (phi_s0->xlu != NULL)) { - gSPDisplayList(oGfxCtx->polyXlu.p++, phi_s0->xlu); + gSPDisplayList(POLY_XLU_DISP++, phi_s0->xlu); } } @@ -343,39 +343,39 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { sp90 = (flags & 2) && polygonDlist->xlu && !(SREG(25) & 4); if (sp94 || sp98) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x03, room->segment); + gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); if (sp94) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, polygonDlist->opa); + gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, polygonDlist->opa); } if (sp98) { - // gSPLoadUcodeL(oGfxCtx->polyOpa.p++, rspS2DEX)? - gSPLoadUcodeEx(oGfxCtx->polyOpa.p++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800); + // gSPLoadUcodeL(POLY_OPA_DISP++, rspS2DEX)? + gSPLoadUcodeEx(POLY_OPA_DISP++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800); { Vec3f sp60; - spA8 = oGfxCtx->polyOpa.p; + spA8 = POLY_OPA_DISP; func_8005AFB4(&sp60, camera); func_8009638C(&spA8, polygon1->single.source, polygon1->single.tlut, polygon1->single.width, polygon1->single.height, polygon1->single.fmt, polygon1->single.siz, polygon1->single.mode0, polygon1->single.tlutCount, (sp60.x + sp60.z) * 1.2f + sp60.y * 0.6f, sp60.y * 2.4f + (sp60.x + sp60.z) * 0.3f); - oGfxCtx->polyOpa.p = spA8; + POLY_OPA_DISP = spA8; } - // gSPLoadUcode(oGfxCtx->polyOpa.p++, SysUcode_GetUCode(), SysUcode_GetUCodeData())? - gSPLoadUcodeEx(oGfxCtx->polyOpa.p++, SysUcode_GetUCode(), SysUcode_GetUCodeData(), 0x800); + // gSPLoadUcode(POLY_OPA_DISP++, SysUcode_GetUCode(), SysUcode_GetUCodeData())? + gSPLoadUcodeEx(POLY_OPA_DISP++, SysUcode_GetUCode(), SysUcode_GetUCodeData(), 0x800); } } if (sp90) { - gSPSegment(oGfxCtx->polyXlu.p++, 0x03, room->segment); + gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, polygonDlist->xlu); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 691); @@ -438,38 +438,38 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { sp8C = (flags & 2) && polygonDlist->xlu && !(SREG(25) & 4); if (sp90 || sp94) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x03, room->segment); + gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); if (sp90) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, polygonDlist->opa); + gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, polygonDlist->opa); } if (sp94) { - // gSPLoadUcodeL(oGfxCtx->polyOpa.p++, rspS2DEX)? - gSPLoadUcodeEx(oGfxCtx->polyOpa.p++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800); + // gSPLoadUcodeL(POLY_OPA_DISP++, rspS2DEX)? + gSPLoadUcodeEx(POLY_OPA_DISP++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800); { Vec3f sp5C; - spA8 = oGfxCtx->polyOpa.p; + spA8 = POLY_OPA_DISP; func_8005AFB4(&sp5C, camera); func_8009638C(&spA8, bgImage->source, bgImage->tlut, bgImage->width, bgImage->height, bgImage->fmt, bgImage->siz, bgImage->mode0, bgImage->tlutCount, (sp5C.x + sp5C.z) * 1.2f + sp5C.y * 0.6f, sp5C.y * 2.4f + (sp5C.x + sp5C.z) * 0.3f); - oGfxCtx->polyOpa.p = spA8; + POLY_OPA_DISP = spA8; } - // gSPLoadUcode(oGfxCtx->polyOpa.p++, SysUcode_GetUCode(), SysUcode_GetUCodeData())? - gSPLoadUcodeEx(oGfxCtx->polyOpa.p++, SysUcode_GetUCode(), SysUcode_GetUCodeData(), 0x800); + // gSPLoadUcode(POLY_OPA_DISP++, SysUcode_GetUCode(), SysUcode_GetUCodeData())? + gSPLoadUcodeEx(POLY_OPA_DISP++, SysUcode_GetUCode(), SysUcode_GetUCodeData(), 0x800); } } if (sp8C) { - gSPSegment(oGfxCtx->polyXlu.p++, 0x03, room->segment); + gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, polygonDlist->xlu); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 819); diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 65e3cee206..4adf07ba6c 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -13,8 +13,8 @@ void Sample_Draw(SampleContext* this) { OPEN_DISPS(gfxCtx, "../z_sample.c", 62); - gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); - gSPSegment(oGfxCtx->polyOpa.p++, 0x01, this->staticSegment); + gSPSegment(POLY_OPA_DISP++, 0x00, NULL); + gSPSegment(POLY_OPA_DISP++, 0x01, this->staticSegment); func_80095248(gfxCtx, 0, 0, 0); @@ -24,16 +24,16 @@ void Sample_Draw(SampleContext* this) { { Mtx* mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); guPosition(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42)); - gSPMatrix(oGfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_LOAD); } - oGfxCtx->polyOpa.p = Gfx_SetFog2(oGfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0); + POLY_OPA_DISP = Gfx_SetFog2(POLY_OPA_DISP, 0xFF, 0xFF, 0xFF, 0, 0, 0); func_80093D18(gfxCtx); - gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_1CYCLE); - gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - gDPSetCombineMode(oGfxCtx->polyOpa.p++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 255, 255, 0, 0); + gDPSetCycleType(POLY_OPA_DISP++, G_CYC_1CYCLE); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 0, 0); CLOSE_DISPS(gfxCtx, "../z_sample.c", 111); } diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 0ddb3ca5bd..ac3e24235a 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -947,8 +947,8 @@ void func_800994A0(GlobalContext* globalCtx) { void func_80099550(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4725); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDefaultDisplayList); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDefaultDisplayList); + gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList); + gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4735); } @@ -963,16 +963,16 @@ void func_800995DC(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4763); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); { s32 pad; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.nightFlag])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.nightFlag])); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4783); } @@ -984,12 +984,12 @@ void func_80099760(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4845); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 0, 64, 32, 1, 0, (gameplayFrames * 2) % 128, 64, 32)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4859); } @@ -1008,28 +1008,28 @@ void func_80099878(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4905); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.nightFlag])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A308[(s32)(gameplayFrames & 14) >> 1])); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.nightFlag])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A308[(s32)(gameplayFrames & 14) >> 1])); + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 0, 64, 32, 1, 0, (gameplayFrames * 1) % 128, 64, 32)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, (gameplayFrames * 2) % 128, 32, 32)); { s32 pad2[2]; } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0B, displayListHead); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 255, 255, 255, globalCtx->unk_11D30[0]); gSPEndDisplayList(displayListHead++); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0C, displayListHead); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 255, 255, 255, globalCtx->unk_11D30[1]); gSPEndDisplayList(displayListHead); @@ -1048,42 +1048,42 @@ void func_80099BD8(GlobalContext* globalCtx) { temp = globalCtx->unk_11D30[0] / 255.0f; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, displayListHead); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x08, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x08, displayListHead); gDPSetPrimColor(displayListHead++, 0, 0, 255 - (u8)(185.0f * temp), 255 - (u8)(145.0f * temp), 255 - (u8)(105.0f * temp), 255); gSPEndDisplayList(displayListHead++); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, displayListHead); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x09, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x09, displayListHead); gDPSetPrimColor(displayListHead++, 0, 0, 76 + (u8)(6.0f * temp), 76 + (u8)(34.0f * temp), 76 + (u8)(74.0f * temp), 255); gSPEndDisplayList(displayListHead++); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, displayListHead); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0A, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x0A, displayListHead); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[0]); gSPEndDisplayList(displayListHead++); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, displayListHead); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0B, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0B, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x0B, displayListHead); gDPSetPrimColor(displayListHead++, 0, 0, 89 + (u8)(166.0f * temp), 89 + (u8)(166.0f * temp), 89 + (u8)(166.0f * temp), 255); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[0]); gSPEndDisplayList(displayListHead++); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, displayListHead); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0C, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x0C, displayListHead); gDPSetPrimColor(displayListHead++, 0, 0, 255 + (u8)(179.0f * temp), 255 + (u8)(179.0f * temp), 255 + (u8)(179.0f * temp), 255); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[0]); gSPEndDisplayList(displayListHead++); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0D, displayListHead); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0D, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0D, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x0D, displayListHead); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[1]); gSPEndDisplayList(displayListHead); @@ -1108,27 +1108,27 @@ void func_8009A45C(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5171); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment( - oGfxCtx->polyOpa.p++, 0x0A, + POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, + gSPSegment(POLY_OPA_DISP++, 0x0B, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, + gSPSegment(POLY_XLU_DISP++, 0x0C, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 50) % 2048, 8, 512, 1, 0, (gameplayFrames * 60) % 2048, 8, 512)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0D, + gSPSegment(POLY_OPA_DISP++, 0x0D, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5212); } @@ -1140,24 +1140,24 @@ void func_8009A798(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5226); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5264); } @@ -1169,18 +1169,18 @@ void func_8009A9DC(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5278); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64, 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5301); } @@ -1192,13 +1192,13 @@ void func_8009AB98(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5317); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5330); } @@ -1210,16 +1210,16 @@ void func_8009ACA8(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5346); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5367); } @@ -1233,20 +1233,20 @@ void func_8009AE30(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; if (globalCtx->sceneNum == SCENE_HAKADAN_BS) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, (gameplayFrames * 2) % 128, 0, 32, 32)); } else { - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, (gameplayFrames * 2) % 128, 0, 32, 32)); } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5416); } @@ -1260,12 +1260,12 @@ void func_8009AFE0(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5490); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); { s32 pad[2]; } - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A328[gSaveContext.nightFlag])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A328[gSaveContext.nightFlag])); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5507); } @@ -1286,56 +1286,56 @@ void func_8009B0FC(GlobalContext* globalCtx) { spAC = globalCtx->unk_11D30[1] & 0xFF; gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[gSaveContext.nightFlag])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[gSaveContext.nightFlag])); if (spB0 == 1) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, spAC)); } else if (spB0 < 1) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 255)); } else { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 160)); } if (spB0 == 2) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, spAC)); } else if (spB0 < 2) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 255)); } else { - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 160)); } if (spB0 != 0) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 160)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, + gSPSegment(POLY_OPA_DISP++, 0x0B, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 180)); } else { - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 160 + (s32)((spAC / 200.0f) * 95.0f))); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, + gSPSegment(POLY_OPA_DISP++, 0x0B, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, 185 + (s32)((spAC / 200.0f) * 70.0f))); } - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, + gSPSegment(POLY_XLU_DISP++, 0x0C, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, 0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 128)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0D, + gSPSegment(POLY_XLU_DISP++, 0x0D, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1, gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 128)); @@ -1351,14 +1351,14 @@ void func_8009B86C(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5791); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, globalCtx->unk_11D30[0]); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, globalCtx->unk_11D30[0]); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 145); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 145); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5808); } @@ -1370,10 +1370,10 @@ void func_8009B9BC(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5822); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5836); } @@ -1385,20 +1385,20 @@ void func_8009BAA4(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5850); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); if (globalCtx->sceneNum == SCENE_HAIRAL_NIWA) { - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64)); } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5876); } @@ -1417,27 +1417,27 @@ void func_8009BC44(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; if (globalCtx->sceneNum == SCENE_GANON_TOU) { - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, 1, 0, (gameplayFrames * 1) % 256, 64, 64)); } - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, + gSPSegment(POLY_OPA_DISP++, 0x0B, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 128, 32, 32, 1, (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); sp83 = (sp83 >> 1) + 192; - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, sp83, sp83, sp83, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, sp83, sp83, sp83, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5930); } @@ -1473,25 +1473,25 @@ void func_8009C0AC(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5968); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 512, 64, 128, 1, 0, 511 - (gameplayFrames * 1) % 512, 64, 128)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 32, 64, 1, 0, 255 - (gameplayFrames * 1) % 256, 32, 64)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 20) % 2048, 16, 512, 1, 0, (gameplayFrames * 30) % 2048, 16, 512)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); sp7B = (sp7B >> 1) + 192; - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, sp7B, sp7B, sp7B, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, sp7B, sp7B, sp7B, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6004); @@ -1514,21 +1514,21 @@ void func_8009C3EC(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6042); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.nightFlag])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.nightFlag])); + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); { s32 pad[2]; } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6076); } @@ -1540,23 +1540,23 @@ void func_8009C608(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6151); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 60) % 2048, 8, 512, 1, 0, (gameplayFrames * 50) % 2048, 8, 512)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, 0, 32, 32, 1, (gameplayFrames * 1) % 128, 0, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0B, + gSPSegment(POLY_XLU_DISP++, 0x0B, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256, 1, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6187); } @@ -1568,19 +1568,19 @@ void func_8009C8B8(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6201); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6232); } @@ -1592,15 +1592,15 @@ void func_8009CAC0(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6249); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6264); } @@ -1616,21 +1616,21 @@ void func_8009CC00(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6290); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.nightFlag])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.nightFlag])); + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); { s32 pad[2]; } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); } @@ -1661,17 +1661,17 @@ void func_8009CF84(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6433); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 255, 255, 255, globalCtx->unk_11D30[0] + 127)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6449); } @@ -1683,21 +1683,21 @@ void func_8009D0E8(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6463); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 5) % 64, 16, 16)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16)); gSPSegment( - oGfxCtx->polyXlu.p++, 0x0B, + POLY_XLU_DISP++, 0x0B, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6491); } @@ -1710,13 +1710,13 @@ void func_8009D31C(GlobalContext* globalCtx) { { s32 pad[2]; } - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A348[gSaveContext.nightFlag])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A348[gSaveContext.nightFlag])); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6528); } @@ -1736,14 +1736,14 @@ void func_8009D438(GlobalContext* globalCtx) { var = gSaveContext.nightFlag; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A358[var])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A350[var])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A358[var])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A350[var])); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6581); } @@ -1755,17 +1755,17 @@ void func_8009D5B4(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6595); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256, 1, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6615); } @@ -1781,21 +1781,21 @@ void func_8009D758(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6640); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.nightFlag])); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.nightFlag])); + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); { s32 pad[2]; } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6671); } @@ -1808,7 +1808,7 @@ void func_8009D974(GlobalContext* globalCtx) { { s32 pad[2]; } - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A368[gSaveContext.nightFlag])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A368[gSaveContext.nightFlag])); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6762); } @@ -1823,20 +1823,20 @@ void func_8009DA30(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6814); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x0A, displayListHead); if ((gSaveContext.dayTime >= 0x4AAC) && (gSaveContext.dayTime <= 0xC555)) { gSPEndDisplayList(displayListHead); @@ -1867,13 +1867,13 @@ void func_8009DD5C(GlobalContext* globalCtx) { { s32 pad[2]; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A370[gSaveContext.nightFlag])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A370[gSaveContext.nightFlag])); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6903); } @@ -1885,21 +1885,21 @@ void func_8009DE78(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6917); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6948); } @@ -1921,18 +1921,18 @@ void func_8009E0B8(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6965); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); if (gSaveContext.sceneSetupIndex == 4) { spA3 = 255 - (u8)globalCtx->unk_11D30[0]; @@ -1942,18 +1942,18 @@ void func_8009E0B8(GlobalContext* globalCtx) { spA0 = 2150; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0A, displayListHead); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 128, 128, 128, spA3); gSPEndDisplayList(displayListHead++); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0B, displayListHead); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x0B, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0B, displayListHead); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 128, 128, 128, spA0 * 0.1f); gSPEndDisplayList(displayListHead); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, + gSPSegment(POLY_OPA_DISP++, 0x0C, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16, 1, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16)); @@ -1971,15 +1971,15 @@ void func_8009E54C(GlobalContext* globalCtx) { } gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0, globalCtx->unk_11D30[0] + 168)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0, 16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 168)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 255, 255, 255, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7097); } @@ -1998,13 +1998,13 @@ void func_8009E730(GlobalContext* globalCtx) { if (LINK_IS_ADULT) { var = 0; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, + gSPSegment(POLY_OPA_DISP++, 0x0C, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 64, 32, 1, 0, var, 64, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A378[gSaveContext.nightFlag])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A378[gSaveContext.nightFlag])); { s32 pad[2]; } @@ -2018,20 +2018,20 @@ void func_8009E8C0(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7161); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 2) % 256, 64, 64, 1, 0, 255 - (gameplayFrames * 2) % 256, 64, 64)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7192); } @@ -2043,30 +2043,30 @@ void func_8009EAD8(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7206); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 3) % 1024, 32, 256, 1, 0, (gameplayFrames * 3) % 1024, 32, 256)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 64, 64, 1, 0, (gameplayFrames * 1) % 256, 64, 64)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 2) % 128, 32, 32, 1, 0, (gameplayFrames * 2) % 128, 32, 32)); gSPSegment( - oGfxCtx->polyOpa.p++, 0x0B, + POLY_OPA_DISP++, 0x0B, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, + gSPSegment(POLY_XLU_DISP++, 0x0C, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0D, + gSPSegment(POLY_XLU_DISP++, 0x0D, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 64, 16, 16, 1, 0, (gameplayFrames * 1) % 64, 16, 16)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7260); } @@ -2080,18 +2080,18 @@ void func_8009EE44(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7274); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128, 0, 32, 16)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32, 1, gameplayFrames % 128, gameplayFrames % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); if ((globalCtx->unk_11D30[0] == 0) && (INV_CONTENT(ITEM_COJIRO) == ITEM_COJIRO)) { if (globalCtx->unk_11D30[1] == 50) { @@ -2111,14 +2111,14 @@ void func_8009F074(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7323); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - gameplayFrames % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7339); } @@ -2131,7 +2131,7 @@ void func_8009F1B4(GlobalContext* globalCtx) { { s32 pad[2]; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag])); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7371); } @@ -2143,18 +2143,18 @@ void func_8009F270(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7385); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7409); } @@ -2166,18 +2166,18 @@ void func_8009F40C(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7423); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7443); } @@ -2190,7 +2190,7 @@ void func_8009F5D4(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7461); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, displayListHead); + gSPSegment(POLY_XLU_DISP++, 0x08, displayListHead); if ((gSaveContext.dayTime >= 0x4AAC) && (gSaveContext.dayTime <= 0xC000)) { gSPEndDisplayList(displayListHead); @@ -2210,11 +2210,11 @@ void func_8009F5D4(GlobalContext* globalCtx) { gSPEndDisplayList(displayListHead); } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7495); } @@ -2234,15 +2234,15 @@ void func_8009F7D4(GlobalContext* globalCtx) { sp6F = (sp6F >> 1) + 192; sp6E = (sp6E >> 1) + 192; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, sp6F, sp6E, 255, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, sp6F, sp6E, 255, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7530); } @@ -2256,17 +2256,17 @@ void func_8009F9D0(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7555); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, gameplayFrames % 128, 0, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A388[gSaveContext.nightFlag])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A388[gSaveContext.nightFlag])); { s32 pad[2]; } @@ -2281,13 +2281,13 @@ void func_8009FB74(GlobalContext* globalCtx) { { s32 pad[2]; } - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A390[gSaveContext.nightFlag])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A390[gSaveContext.nightFlag])); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7615); } @@ -2299,19 +2299,19 @@ void func_8009FC90(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7630); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, 127 - gameplayFrames % 128, 0, 32, 32)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 127 - (gameplayFrames * 6) % 128, 32, 32, 1, (gameplayFrames * 6) % 128, 127 - (gameplayFrames * 3) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 64); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 64); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 64); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 64); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7653); } @@ -2331,23 +2331,23 @@ void func_8009FE58(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; if (globalCtx->sceneNum == SCENE_BDAN) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32, 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, + gSPSegment(POLY_OPA_DISP++, 0x0B, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, 1, 0, 255 - (gameplayFrames * 4) % 256, 32, 64)); } else { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128, (gameplayFrames * 1) % 128, 32, 32)); } - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); if (func_800C0D28(globalCtx) != 1) { D_8012A39C += 1820; @@ -2390,7 +2390,7 @@ void func_8009FE58(GlobalContext* globalCtx) { Matrix_Scale(1.005f, sinf(D_8012A398) * 0.8f, 1.005f, MTXMODE_NEW); } - gSPSegment(oGfxCtx->polyOpa.p++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_scene_table.c", 7809)); + gSPSegment(POLY_OPA_DISP++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_scene_table.c", 7809)); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7811); } @@ -2408,21 +2408,21 @@ void func_800A0334(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7825); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128, 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, + gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7852); } @@ -2444,16 +2444,16 @@ void func_800A059C(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7893); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128)); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 128, 128, 128, 128); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7910); } @@ -2491,8 +2491,8 @@ void Scene_Draw(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 8104); if (HREG(81) == 1) { - gSPDisplayList(oGfxCtx->polyOpa.p++, sDefaultDisplayList); - gSPDisplayList(oGfxCtx->polyXlu.p++, sDefaultDisplayList); + gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList); + gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 8109); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index a890c9a7f4..441dcef537 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -49,10 +49,10 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { Matrix_JointPosition(&pos, &rot); if (dList != NULL) { - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 805), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 805), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList); + gSPDisplayList(POLY_OPA_DISP++, dList); } } @@ -110,10 +110,10 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limb if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { Matrix_JointPosition(&pos, &rot); if (dList != NULL) { - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 881), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 881), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList); + gSPDisplayList(POLY_OPA_DISP++, dList); } } if (postLimbDraw != NULL) { @@ -161,8 +161,8 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* if (dList[1] != NULL) { Matrix_ToMtx(*mtx, "../z_skelanime.c", 945); OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 946); - gSPMatrix(oGfxCtx->polyOpa.p++, *mtx, G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList[1]); + gSPMatrix(POLY_OPA_DISP++, *mtx, G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, dList[1]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 949); (*mtx)++; } else if (dList[0] != NULL) { @@ -211,7 +211,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* li OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1000); - gSPSegment(oGfxCtx->polyOpa.p++, 0xD, mtx); + gSPSegment(POLY_OPA_DISP++, 0xD, mtx); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); @@ -228,8 +228,8 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* li Matrix_JointPosition(&pos, &rot); if (dList[1] != NULL) { Matrix_ToMtx(mtx, "../z_skelanime.c", 1033); - gSPMatrix(oGfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList[1]); + gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, dList[1]); mtx++; } else if (dList[0] != NULL) { Matrix_ToMtx(mtx, "../z_skelanime.c", 1040); @@ -275,9 +275,9 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { Matrix_JointPosition(&pos, &rot); if (dList != NULL) { - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1103), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1103), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList); + gSPDisplayList(POLY_OPA_DISP++, dList); } } @@ -332,9 +332,9 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbDra if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { Matrix_JointPosition(&pos, &rot); if (dList != NULL) { - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1176), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1176), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList); + gSPDisplayList(POLY_OPA_DISP++, dList); } } @@ -379,8 +379,8 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske Matrix_JointPosition(&pos, &rot); if (dList[1] != NULL) { Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1242); - gSPMatrix(oGfxCtx->polyOpa.p++, *limbMatricies, G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList[1]); + gSPMatrix(POLY_OPA_DISP++, *limbMatricies, G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, dList[1]); (*limbMatricies)++; } else if (dList[0] != NULL) { Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1249); @@ -427,7 +427,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbD OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); - gSPSegment(oGfxCtx->polyOpa.p++, 0xD, mtx); + gSPSegment(POLY_OPA_DISP++, 0xD, mtx); Matrix_Push(); @@ -446,8 +446,8 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbD Matrix_JointPosition(&pos, &rot); if (dList[1] != NULL) { Matrix_ToMtx(mtx, "../z_skelanime.c", 1327); - gSPMatrix(oGfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dList[1]); + gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, dList[1]); mtx++; } else { if (dList[0] != NULL) { diff --git a/src/code/z_view.c b/src/code/z_view.c index 5807cc0fb7..99666b3b8b 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -174,10 +174,10 @@ void func_800AA550(View* view) { OPEN_DISPS(gfxCtx, "../z_view.c", 459); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetScissor(oGfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetScissor(oGfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetScissor(POLY_OPA_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetScissor(POLY_XLU_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); CLOSE_DISPS(gfxCtx, "../z_view.c", 472); } @@ -289,8 +289,8 @@ s32 func_800AAA9C(View* view) { func_800AA550(view); - gSPViewport(oGfxCtx->polyOpa.p++, vp); - gSPViewport(oGfxCtx->polyXlu.p++, vp); + gSPViewport(POLY_OPA_DISP++, vp); + gSPViewport(POLY_XLU_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 616); @@ -333,10 +333,10 @@ s32 func_800AAA9C(View* view) { func_800AA890(view, projection); - gSPPerspNormalize(oGfxCtx->polyOpa.p++, view->normal); - gSPMatrix(oGfxCtx->polyOpa.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPPerspNormalize(oGfxCtx->polyXlu.p++, view->normal); - gSPMatrix(oGfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPPerspNormalize(POLY_OPA_DISP++, view->normal); + gSPMatrix(POLY_OPA_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPPerspNormalize(POLY_XLU_DISP++, view->normal); + gSPMatrix(POLY_XLU_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667); @@ -366,8 +366,8 @@ s32 func_800AAA9C(View* view) { osSyncPrintf("\n"); } - gSPMatrix(oGfxCtx->polyOpa.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); - gSPMatrix(oGfxCtx->polyXlu.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPMatrix(POLY_OPA_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPMatrix(POLY_XLU_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); CLOSE_DISPS(gfxCtx, "../z_view.c", 711); @@ -390,9 +390,9 @@ s32 func_800AB0A8(View* view) { func_800AA550(view); - gSPViewport(oGfxCtx->polyOpa.p++, vp); - gSPViewport(oGfxCtx->polyXlu.p++, vp); - gSPViewport(oGfxCtx->overlay.p++, vp); + gSPViewport(POLY_OPA_DISP++, vp); + gSPViewport(POLY_XLU_DISP++, vp); + gSPViewport(OVERLAY_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744); @@ -403,8 +403,8 @@ s32 func_800AB0A8(View* view) { view->projection = *projection; - gSPMatrix(oGfxCtx->polyOpa.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPMatrix(oGfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(POLY_OPA_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(POLY_XLU_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); CLOSE_DISPS(gfxCtx, "../z_view.c", 762); @@ -427,10 +427,10 @@ s32 func_800AB2C4(View* view) { View_ViewportToVp(vp, &view->viewport); view->vp = *vp; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetScissor(oGfxCtx->overlay.p++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, + gDPPipeSync(OVERLAY_DISP++); + gDPSetScissor(OVERLAY_DISP++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, view->viewport.rightX, view->viewport.bottomY); - gSPViewport(oGfxCtx->overlay.p++, vp); + gSPViewport(OVERLAY_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791); @@ -441,7 +441,7 @@ s32 func_800AB2C4(View* view) { view->projection = *projection; - gSPMatrix(oGfxCtx->overlay.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); CLOSE_DISPS(gfxCtx, "../z_view.c", 801); @@ -467,10 +467,10 @@ s32 func_800AB560(View* view) { View_ViewportToVp(vp, &view->viewport); view->vp = *vp; - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetScissor(oGfxCtx->overlay.p++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, + gDPPipeSync(OVERLAY_DISP++); + gDPSetScissor(OVERLAY_DISP++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, view->viewport.rightX, view->viewport.bottomY); - gSPViewport(oGfxCtx->overlay.p++, vp); + gSPViewport(OVERLAY_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 833); @@ -484,8 +484,8 @@ s32 func_800AB560(View* view) { view->projection = *projection; - gSPPerspNormalize(oGfxCtx->overlay.p++, view->normal); - gSPMatrix(oGfxCtx->overlay.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPPerspNormalize(OVERLAY_DISP++, view->normal); + gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848); @@ -503,7 +503,7 @@ s32 func_800AB560(View* view) { view->viewing = *viewing; - gSPMatrix(oGfxCtx->overlay.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPMatrix(OVERLAY_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); CLOSE_DISPS(gfxCtx, "../z_view.c", 871); diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index f08feaf929..90b7b2d9b6 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -16,12 +16,12 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb func_800945A0(gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 7, skyboxCtx->staticSegments[0]); - gSPSegment(oGfxCtx->polyOpa.p++, 8, skyboxCtx->staticSegments[1]); - gSPSegment(oGfxCtx->polyOpa.p++, 9, skyboxCtx->staticSegments[2]); + gSPSegment(POLY_OPA_DISP++, 7, skyboxCtx->staticSegments[0]); + gSPSegment(POLY_OPA_DISP++, 8, skyboxCtx->staticSegments[1]); + gSPSegment(POLY_OPA_DISP++, 9, skyboxCtx->staticSegments[2]); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x00, 0x00, 0, 0, 0, alpha); - gSPTexture(oGfxCtx->polyOpa.p++, 0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON); + gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, 0, 0, 0, alpha); + gSPTexture(POLY_OPA_DISP++, 0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON); sSkyboxDrawMatrix = Graph_Alloc(gfxCtx, sizeof(Mtx)); @@ -31,53 +31,53 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb Matrix_RotateY(skyboxCtx->rot.y, MTXMODE_APPLY); Matrix_RotateZ(skyboxCtx->rot.z, MTXMODE_APPLY); Matrix_ToMtx(sSkyboxDrawMatrix, "../z_vr_box_draw.c", 76); - gSPMatrix(oGfxCtx->polyOpa.p++, sSkyboxDrawMatrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, sSkyboxDrawMatrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetColorDither(oGfxCtx->polyOpa.p++, G_CD_MAGICSQ); - gDPSetTextureFilter(oGfxCtx->polyOpa.p++, G_TF_BILERP); + gDPSetColorDither(POLY_OPA_DISP++, G_CD_MAGICSQ); + gDPSetTextureFilter(POLY_OPA_DISP++, G_TF_BILERP); - gDPLoadTLUT_pal256(oGfxCtx->polyOpa.p++, skyboxCtx->staticSegments[2]); - gDPSetTextureLUT(oGfxCtx->polyOpa.p++, G_TT_RGBA16); - gDPSetTextureConvert(oGfxCtx->polyOpa.p++, G_TC_FILT); + gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->staticSegments[2]); + gDPSetTextureLUT(POLY_OPA_DISP++, G_TT_RGBA16); + gDPSetTextureConvert(POLY_OPA_DISP++, G_TC_FILT); if (skyboxCtx->unk_140) { - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 1); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 1); - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPPipeSync(POLY_OPA_DISP++); - gDPLoadTLUT_pal256(oGfxCtx->polyOpa.p++, (u16*)skyboxCtx->staticSegments[2] + 256 * 1); + gDPLoadTLUT_pal256(POLY_OPA_DISP++, (u16*)skyboxCtx->staticSegments[2] + 256 * 1); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 2); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 3); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 2); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 3); if (skyboxId != 2) { if (skyboxId <= 0x10 || skyboxId >= 0x19) { - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPLoadTLUT_pal256(oGfxCtx->polyOpa.p++, (u16*)skyboxCtx->staticSegments[2] + 256 * 2); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 4); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 5); - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPPipeSync(POLY_OPA_DISP++); + gDPLoadTLUT_pal256(POLY_OPA_DISP++, (u16*)skyboxCtx->staticSegments[2] + 256 * 2); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 4); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 5); + gDPPipeSync(POLY_OPA_DISP++); if (skyboxCtx->unk_140 != 2) { - gDPLoadTLUT_pal256(oGfxCtx->polyOpa.p++, (u16*)skyboxCtx->staticSegments[2] + 256 * 3); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 6); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 7); + gDPLoadTLUT_pal256(POLY_OPA_DISP++, (u16*)skyboxCtx->staticSegments[2] + 256 * 3); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 6); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 7); } } } } else { - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 2); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 4); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 6); - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 8); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 2); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 4); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 6); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 8); if (skyboxId == 5) { - gSPDisplayList(oGfxCtx->polyOpa.p++, skyboxCtx->dpList + 150 * 10); + gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dpList + 150 * 10); } } - gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPPipeSync(POLY_OPA_DISP++); CLOSE_DISPS(gfxCtx, "../z_vr_box_draw.c", 125); } diff --git a/src/libultra_code_O2/code_80102FA0.c b/src/libultra_code_O2/code_80102FA0.c deleted file mode 100644 index fe6c1d3ee2..0000000000 --- a/src/libultra_code_O2/code_80102FA0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "ultra64.h" -#include "global.h" - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80102FA0/func_80102FA0.s") diff --git a/src/libultra_code_O2/code_80104D60.c b/src/libultra_code_O2/code_80104D60.c deleted file mode 100644 index 12cb746a58..0000000000 --- a/src/libultra_code_O2/code_80104D60.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "ultra64.h" -#include "global.h" - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80104D60/osPfsFileState.s") diff --git a/src/libultra_code_O2/osPfsFileState.c b/src/libultra_code_O2/osPfsFileState.c new file mode 100644 index 0000000000..aa7cc4f4ab --- /dev/null +++ b/src/libultra_code_O2/osPfsFileState.c @@ -0,0 +1,57 @@ +#include "ultra64.h" +#include "global.h" + +s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state) { + s32 ret; + s32 pages; + __OSInode inode; + __OSDir dir; + __OSInodeUnit page; + u8 bank; + + if (fileNo >= pfs->dir_size || fileNo < 0) { + return PFS_ERR_INVALID; + } + if (!(pfs->status & PFS_INITIALIZED)) { + return PFS_ERR_INVALID; + } + if ((ret = __osCheckId(pfs)) != 0) { + return ret; + } + if (pfs->activebank != 0 && (ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + fileNo, &dir)) != 0) { + return ret; + } + if (dir.company_code == 0 || dir.game_code == 0) { + return PFS_ERR_INVALID; + } + + page = dir.start_page; + pages = 0; + bank = 0xFF; + while (true) { + if (page.ipage < pfs->inodeStartPage) { + break; + } + if (page.inode_t.bank != bank) { + bank = page.inode_t.bank; + if ((ret = __osPfsRWInode(pfs, &inode, PFS_READ, bank)) != 0) { + return ret; + } + } + pages++; + page = inode.inodePage[page.inode_t.page]; + } + if (page.ipage != PFS_EOF) { + return PFS_ERR_INCONSISTENT; + } + + state->file_size = pages * PFS_ONE_PAGE * BLOCKSIZE; + state->company_code = dir.company_code; + state->game_code = dir.game_code; + bcopy(&dir.game_name, state->game_name, PFS_FILE_NAME_LEN); + bcopy(&dir.ext_name, state->ext_name, PFS_FILE_EXT_LEN); + return __osPfsGetStatus(pfs->queue, pfs->channel); +} diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 88c1aa326c..775fe35ca5 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -325,9 +325,9 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80090480(globalCtx, &this->collider, &this->hookInfo, &sp6C, &sp60); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 895), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 895), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_0602B288); + gSPDisplayList(POLY_OPA_DISP++, D_0602B288); Matrix_Translate(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, MTXMODE_NEW); Math_Vec3f_Diff(&player->unk_3C8, &this->actor.posRot.pos, &sp78); sp58 = SQ(sp78.x) + SQ(sp78.z); @@ -335,9 +335,9 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(Math_atan2f(sp78.x, sp78.z), MTXMODE_APPLY); Matrix_RotateX(Math_atan2f(-sp78.y, sp5C), MTXMODE_APPLY); Matrix_Scale(0.015f, 0.015f, sqrtf(SQ(sp78.y) + sp58) * 0.01f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 910), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 910), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_0602AFF0); + gSPDisplayList(POLY_OPA_DISP++, D_0602AFF0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arms_hook.c", 913); } diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 375acb4ec1..ca8e3475c8 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -215,18 +215,18 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) { // Draw red effect over the screen when arrow hits if (this->unk_15C > 0) { - oGfxCtx->polyXlu.p = func_800937C0(oGfxCtx->polyXlu.p); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, (s32)(40.0f * this->unk_15C) & 0xFF, 0, 0, + POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (s32)(40.0f * this->unk_15C) & 0xFF, 0, 0, (s32)(150.0f * this->unk_15C) & 0xFF); - gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_DISABLE); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_DISABLE); - gDPFillRectangle(oGfxCtx->polyXlu.p++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_DISABLE); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); + gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } // Draw fire on the arrow func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 200, 0, this->alpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 128); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 200, 0, this->alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128); Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); @@ -235,13 +235,13 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Scale(this->radius * 0.2f, this->unk_158 * 4.0f, this->radius * 0.2f, MTXMODE_APPLY); Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 666), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 666), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1, 255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sVertexDL); + gSPDisplayList(POLY_XLU_DISP++, sVertexDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682); } diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 78ab62bacd..e34b68c11f 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -216,18 +216,18 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { // Draw blue effect over the screen when arrow hits if (this->unk_164 > 0) { - oGfxCtx->polyXlu.p = func_800937C0(oGfxCtx->polyXlu.p); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 0, (s32)(10.0f * this->unk_164) & 0xFF, + POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, (s32)(10.0f * this->unk_164) & 0xFF, (s32)(50.0f * this->unk_164) & 0xFF, (s32)(150.0f * this->unk_164) & 0xFF); - gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_DISABLE); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_DISABLE); - gDPFillRectangle(oGfxCtx->polyXlu.p++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_DISABLE); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); + gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } // Draw ice on the arrow func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 170, 255, 255, this->alpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 128); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 170, 255, 255, this->alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, 128); Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); @@ -236,13 +236,13 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Scale(this->radius * 0.2f, this->unk_160 * 3.0f, this->radius * 0.2f, MTXMODE_APPLY); Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 660), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 660), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sVertexDL); + gSPDisplayList(POLY_XLU_DISP++, sVertexDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676); } diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 1e59f5eb7d..02feaaf5e4 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -216,18 +216,18 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { // Draw yellow effect over the screen when arrow hits if (this->unk_164 > 0) { - oGfxCtx->polyXlu.p = func_800937C0(oGfxCtx->polyXlu.p); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, (s32)(30.0f * this->unk_164) & 0xFF, + POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (s32)(30.0f * this->unk_164) & 0xFF, (s32)(40.0f * this->unk_164) & 0xFF, 0, (s32)(150.0f * this->unk_164) & 0xFF); - gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_DISABLE); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_DISABLE); - gDPFillRectangle(oGfxCtx->polyXlu.p++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_DISABLE); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); + gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } // Draw light on the arrow func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 170, this->alpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 255, 0, 128); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 170, this->alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 128); Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); @@ -236,13 +236,13 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Scale(this->radius * 0.2f, this->unk_160 * 4.0f, this->radius * 0.2f, MTXMODE_APPLY); Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_light.c", 648), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_light.c", 648), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 4, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sVertexDL); + gSPDisplayList(POLY_XLU_DISP++, sVertexDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_light.c", 664); } diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 07178bf96d..c4685dd570 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -274,9 +274,9 @@ void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) { if (Flags_GetEventChkInf(0xB0)) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 677), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 677), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_60013500); + gSPDisplayList(POLY_OPA_DISP++, D_60013500); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 681); diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 27de2b09bc..f6aa35d6f9 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -131,9 +131,9 @@ void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 328), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 328), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001CD0); + gSPDisplayList(POLY_OPA_DISP++, D_06001CD0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333); } diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index dfd138731c..3340e59d0c 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -107,18 +107,18 @@ void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 8, + gSPSegment(POLY_XLU_DISP++, 8, Gfx_TexScroll(globalCtx->state.gfxCtx, globalCtx->gameplayFrames & 127, globalCtx->gameplayFrames * -3 & 127, 32, 32)); - gSPSegment(oGfxCtx->polyXlu.p++, 9, + gSPSegment(POLY_XLU_DISP++, 9, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -globalCtx->gameplayFrames & 127, 32, 32, 1, 0, globalCtx->gameplayFrames & 127, 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 281), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 281), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000600); + gSPDisplayList(POLY_XLU_DISP++, D_06000600); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285); } diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 1acdce8353..e7bc8124fe 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -204,7 +204,7 @@ void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 378); //@bug Due to a bug in the display list, the transparency data is not used. - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 198, 202, 208, this->timer2); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, this->timer2); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 380); Gfx_DrawDListXlu(globalCtx, D_0600BEC0); @@ -213,7 +213,7 @@ void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, GlobalContext* globalCtx) { void BgGndDarkmeiro_DrawStaticBlock(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 391); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 198, 202, 208, 255); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, 255); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 393); Gfx_DrawDListXlu(globalCtx, D_0600BEC0); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 0dd69cefbd..4c476b7894 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -197,10 +197,10 @@ void BgGndSoulmeiro_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_soulmeiro.c", 398); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gnd_soulmeiro.c", 400), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gnd_soulmeiro.c", 400), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_8087B578[params]); + gSPDisplayList(POLY_XLU_DISP++, D_8087B578[params]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_soulmeiro.c", 403); break; case 1: diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index efd5baf7cb..53854ef5a2 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -157,13 +157,13 @@ void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 406), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 406), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060001B0); + gSPDisplayList(POLY_OPA_DISP++, D_060001B0); Matrix_Translate(0.0f, 0.0f, thisx->minVelocityY * 10.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 416), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 416), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_060002A8); + gSPDisplayList(POLY_XLU_DISP++, D_060002A8); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka.c", 421); } diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 5598b79358..cb44f51940 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -205,14 +205,14 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) { Matrix_RotateY(this->dyna.actor.shape.rot.y * 0.0000958738f, MTXMODE_APPLY); Matrix_Scale(0.07f, 0.04f, 0.07f, MTXMODE_APPLY); if (1) {} - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 0, 170, 255, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 0, 170, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, 255); + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->fireScroll & 127, 0, 32, 64, 1, 0, (this->fireScroll * -15) & 0xFF, 32, 64)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 497), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 497), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_040184B0); + gSPDisplayList(POLY_XLU_DISP++, D_040184B0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 501); } diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 1af709622d..98e09a5091 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -510,9 +510,9 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_MultVec3f(&D_80884ED4, &thisx->initPosRot); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 931), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 931), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060013C0); + gSPDisplayList(POLY_OPA_DISP++, D_060013C0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 935); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 385f555138..ee52113355 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -236,18 +236,18 @@ void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 685); func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 220, 0, this->alpha); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 220, 0, this->alpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->texScroll & 0x7F, 0, 0x20, 0x40, 1, 0, (this->texScroll * -0xF) & 0xFF, 0x20, 0x40)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 698), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 698), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_040184B0); + gSPDisplayList(POLY_XLU_DISP++, D_040184B0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 702); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 0d4273c77e..1925ef8551 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -195,14 +195,14 @@ void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 448); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x14); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80886D04[this->unk_150])); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0x01, 255, 255, 0, 150); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 255); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 458), + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80886D04[this->unk_150])); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x01, 255, 255, 0, 150); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 458), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0600DA80); + gSPDisplayList(POLY_XLU_DISP++, D_0600DA80); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 463); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 8f52157c63..91ba4f00bc 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -4,12 +4,30 @@ #define THIS ((BgHidanFwbig*)thisx) +typedef enum { + /* 0 */ FWBIG_MOVE, + /* 1 */ FWBIG_RESET, + /* 2 */ FWBIG_KILL +} HidanFwbigMoveState; + void BgHidanFwbig_Init(Actor* thisx, GlobalContext* globalCtx); void BgHidanFwbig_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgHidanFwbig_Update(Actor* thisx, GlobalContext* globalCtx); void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void BgHidanFwbig_UpdatePosition(BgHidanFwbig* this); + +void BgHidanFwbig_WaitForSwitch(BgHidanFwbig* this, GlobalContext* globalCtx); +void BgHidanFwbig_WaitForCs(BgHidanFwbig* this, GlobalContext* globalCtx); +void BgHidanFwbig_Lower(BgHidanFwbig* this, GlobalContext* globalCtx); +void BgHidanFwbig_WaitForTimer(BgHidanFwbig* this, GlobalContext* globalCtx); +void BgHidanFwbig_WaitForPlayer(BgHidanFwbig* this, GlobalContext* globalCtx); +void BgHidanFwbig_Move(BgHidanFwbig* this, GlobalContext* globalCtx); + +extern Gfx D_0600DB20[]; +extern Gfx D_040173D0[]; +extern Gfx D_04017BD0[]; + const ActorInit Bg_Hidan_Fwbig_InitVars = { ACTOR_BG_HIDAN_FWBIG, ACTORTYPE_PROP, @@ -21,29 +39,223 @@ const ActorInit Bg_Hidan_Fwbig_InitVars = { (ActorFunc)BgHidanFwbig_Update, (ActorFunc)BgHidanFwbig_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x11, 0x00, 0x09, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x20000000, 0x01, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x19, 0x00, 0x01 }, + { 30, 130, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s") +void BgHidanFwbig_Init(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + BgHidanFwbig* this = THIS; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->actor.colChkInfo.mass = 0xFF; + this->direction = (u16)(thisx->params >> 8); + thisx->params &= 0xFF; + if (this->direction != 0) { + this->actor.initPosRot.pos.x = 1560.0f; + this->actor.initPosRot.pos.z = 0.0f; + if (player->actor.posRot.pos.z > 300.0f) { + this->direction = -1; + this->actor.initPosRot.rot.y = this->actor.shape.rot.y = -0x4E38; + } else if (player->actor.posRot.pos.z < -300.0f) { + this->direction = 1; + this->actor.initPosRot.rot.y = this->actor.shape.rot.y = -0x31C8; + } else { + Actor_Kill(&this->actor); + return; + } + BgHidanFwbig_UpdatePosition(this); + Actor_SetScale(&this->actor, 0.15f); + this->collider.dim.height = 230; + this->actor.flags |= 0x10; + this->moveState = FWBIG_MOVE; + this->actionFunc = BgHidanFwbig_WaitForPlayer; + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y - (2400.0f * this->actor.scale.y); + } else { + Actor_SetScale(&this->actor, 0.1f); + this->actionFunc = BgHidanFwbig_WaitForSwitch; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s") +void BgHidanFwbig_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgHidanFwbig* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s") +void BgHidanFwbig_UpdatePosition(BgHidanFwbig* this) { + s16 startAngle = this->actor.shape.rot.y + this->direction * -0x4000; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s") + this->actor.posRot.pos.x = (Math_Sins(startAngle) * 885.4f) + this->actor.initPosRot.pos.x; + this->actor.posRot.pos.z = (Math_Coss(startAngle) * 885.4f) + this->actor.initPosRot.pos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s") +void BgHidanFwbig_WaitForSwitch(BgHidanFwbig* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->actor.params)) { + this->actionFunc = BgHidanFwbig_WaitForCs; + func_800800F8(globalCtx, 0xD0C, -0x63, &this->actor, 0); + this->timer = 35; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s") +void BgHidanFwbig_WaitForCs(BgHidanFwbig* this, GlobalContext* globalCtx) { + if (this->timer-- == 0) { + this->actionFunc = BgHidanFwbig_Lower; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s") +void BgHidanFwbig_Rise(BgHidanFwbig* this, GlobalContext* globalCtx) { + if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 10.0f)) { + if (this->direction == 0) { + Flags_UnsetSwitch(globalCtx, this->actor.params); + this->actionFunc = BgHidanFwbig_WaitForSwitch; + } else { + this->actionFunc = BgHidanFwbig_Move; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s") +void BgHidanFwbig_Lower(BgHidanFwbig* this, GlobalContext* globalCtx) { + if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - (2400.0f * this->actor.scale.y), + 10.0f)) { + if (this->direction == 0) { + this->actionFunc = BgHidanFwbig_WaitForTimer; + this->timer = 150; + } else if (this->moveState == FWBIG_KILL) { + Actor_Kill(&this->actor); + } else { + if (this->moveState == FWBIG_MOVE) { + this->actor.shape.rot.y -= (this->direction * 0x1800); + } else { + this->moveState = FWBIG_MOVE; + this->actor.shape.rot.y = this->actor.initPosRot.rot.y; + } + BgHidanFwbig_UpdatePosition(this); + this->actionFunc = BgHidanFwbig_Rise; + } + } +} + +void BgHidanFwbig_WaitForTimer(BgHidanFwbig* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + if (this->timer == 0) { + this->actionFunc = BgHidanFwbig_Rise; + } + func_8002F994(&this->actor, this->timer); +} + +void BgHidanFwbig_WaitForPlayer(BgHidanFwbig* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (player->actor.posRot.pos.x < 1150.0f) { + this->actionFunc = BgHidanFwbig_Rise; + func_800800F8(globalCtx, 0xCDA, -0x63, &this->actor, 0); + } +} + +void BgHidanFwbig_Move(BgHidanFwbig* this, GlobalContext* globalCtx) { + if (!Player_InCsMode(globalCtx)) { + if (Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, + this->actor.initPosRot.rot.y + (this->direction * 0x6390), 0x20)) { + this->moveState = FWBIG_RESET; + this->actionFunc = BgHidanFwbig_Lower; + } else { + BgHidanFwbig_UpdatePosition(this); + } + } +} + +void BgHidanFwbig_MoveCollider(BgHidanFwbig* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Vec3f projPos; + f32 cs; + f32 sn; + + func_8002DBD0(&this->actor, &projPos, &player->actor.posRot.pos); + projPos.z = ((projPos.z >= 0.0f) ? 1.0f : -1.0f) * 25.0f * -1.0f; + if (this->direction == 0) { + projPos.x = CLAMP(projPos.x, -360.0f, 360.0f); + } else { + projPos.x = CLAMP(projPos.x, -500.0f, 500.0f); + } + + sn = Math_Sins(this->actor.shape.rot.y); + cs = Math_Coss(this->actor.shape.rot.y); + this->collider.dim.pos.x = this->actor.posRot.pos.x + (projPos.x * cs) + (projPos.z * sn); + this->collider.dim.pos.z = this->actor.posRot.pos.z - (projPos.x * sn) + (projPos.z * cs); + this->collider.dim.pos.y = this->actor.posRot.pos.y; + + this->actor.posRot.rot.y = (projPos.z < 0.0f) ? this->actor.shape.rot.y : this->actor.shape.rot.y + 0x8000; +} + +void BgHidanFwbig_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgHidanFwbig* this = THIS; + + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + func_8002F71C(globalCtx, &this->actor, 5.0f, this->actor.posRot.rot.y, 1.0f); + if (this->direction != 0) { + this->actionFunc = BgHidanFwbig_Lower; + } + } + if ((this->direction != 0) && (globalCtx->roomCtx.prevRoom.num == this->actor.room)) { + this->moveState = FWBIG_KILL; + this->actionFunc = BgHidanFwbig_Lower; + } + + this->actionFunc(this, globalCtx); + + if ((this->actor.initPosRot.pos.y - 200.0f) < this->actor.posRot.pos.y) { + if (gSaveContext.sceneSetupIndex < 4) { + func_8002F974(&this->actor, NA_SE_EV_BURNING - SFX_FLAG); + } else if ((s16)this->actor.posRot.pos.x == -513) { + func_8002F974(&this->actor, NA_SE_EV_FLAME_OF_FIRE - SFX_FLAG); + } + BgHidanFwbig_MoveCollider(this, globalCtx); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } +} + +void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + f32 height; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_fwbig.c", 630); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_040173D0)); + + gSPSegment(POLY_XLU_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_04017BD0)); + + height = thisx->scale.y * 2400.0f; + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 220, 0, + ((height - (thisx->initPosRot.pos.y - thisx->posRot.pos.y)) * 255.0f) / height); + + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); + + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 0x80, 0, 0x20, 0x40, 1, 0, + (u8)(globalCtx->gameplayFrames * -15), 0x20, 0x40)); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_fwbig.c", 660), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(POLY_XLU_DISP++, D_0600DB20); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_fwbig.c", 664); +} diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h index 864e97d5df..9ceb36d5bd 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h @@ -6,9 +6,15 @@ struct BgHidanFwbig; +typedef void (*BgHidanFwbigActionFunc)(struct BgHidanFwbig*, GlobalContext*); + typedef struct BgHidanFwbig { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x54]; + /* 0x014C */ BgHidanFwbigActionFunc actionFunc; + /* 0x0150 */ s8 direction; + /* 0x0151 */ u8 moveState; + /* 0x0152 */ s16 timer; + /* 0x0154 */ ColliderCylinder collider; } BgHidanFwbig; // size = 0x01A0 extern const ActorInit Bg_Hidan_Fwbig_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index d499a18df4..2147886e15 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -156,9 +156,9 @@ void BgHidanKousi_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_kousi.c", 354), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_kousi.c", 354), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_80889E84[thisx->params & 0xFF]); + gSPDisplayList(POLY_OPA_DISP++, D_80889E84[thisx->params & 0xFF]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_kousi.c", 359); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 1a7e37485e..76e9587c60 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -182,28 +182,28 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 568), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 568), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_0600AD00); + gSPDisplayList(POLY_OPA_DISP++, D_0600AD00); Matrix_MtxFCopy(&mf, &gMtxFClear); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0x14); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); if ((s16)((func_8005A9F4(ACTIVE_CAM) - this->dyna.actor.shape.rot.y) - 0x2E6C) >= 0) { for (i = 3; i >= 0; i--) { - oGfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 0, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 0, POLY_XLU_DISP); } for (i = 0; i < 4; i++) { - oGfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 1, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 1, POLY_XLU_DISP); } } else { for (i = 3; i >= 0; i--) { - oGfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 1, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 1, POLY_XLU_DISP); } for (i = 0; i < 4; i++) { - oGfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 0, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 0, POLY_XLU_DISP); } } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 5492efb411..e79dc0218f 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -111,10 +111,10 @@ void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 245), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 245), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001040); + gSPDisplayList(POLY_OPA_DISP++, D_06001040); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 250); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index 4469ad10a0..55ad7cbb02 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -72,11 +72,11 @@ void BgJyaBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(&D_05004350)); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_block.c", 153), + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_05004350)); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_block.c", 153), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 232, 210, 176, 255); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_05004CD0); + gDPSetEnvColor(POLY_OPA_DISP++, 232, 210, 176, 255); + gSPDisplayList(POLY_OPA_DISP++, D_05004CD0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_block.c", 158); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 65450ec90a..4b9b92e0a7 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -1,4 +1,5 @@ #include "z_bg_jya_bombchuiwa.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000001 @@ -9,7 +10,12 @@ void BgJyaBombchuiwa_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgJyaBombchuiwa_Update(Actor* thisx, GlobalContext* globalCtx); void BgJyaBombchuiwa_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void BgJyaBombchuiwa_WaitForExplosion(BgJyaBombchuiwa* this, GlobalContext* globalCtx); +void BgJyaBombchuiwa_SetupWaitForExplosion(BgJyaBombchuiwa* this, GlobalContext* globalCtx); +void func_808949B8(BgJyaBombchuiwa* this, GlobalContext* globalCtx); +void BgJyaBombchuiwa_CleanUpAfterExplosion(BgJyaBombchuiwa* this, GlobalContext* globalCtx); +void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, GlobalContext* globalCtx); + const ActorInit Bg_Jya_Bombchuiwa_InitVars = { ACTOR_BG_JYA_BOMBCHUIWA, ACTORTYPE_BG, @@ -21,31 +27,207 @@ const ActorInit Bg_Jya_Bombchuiwa_InitVars = { (ActorFunc)BgJyaBombchuiwa_Update, (ActorFunc)BgJyaBombchuiwa_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s") +static ColliderJntSphItemInit sJntSphItemsInit[1] = { + { + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 0, { { -300, 0, 0 }, 40 }, 100 }, + }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s") +static ColliderJntSphInit sJntSphInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x21, 0x20, COLSHAPE_JNTSPH }, + 1, + sJntSphItemsInit, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s") +static InitChainEntry sInitChain[] = { + ICHAIN_U8(unk_1F, 3, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s") +extern Gfx D_0600EDC0[]; +extern Gfx D_0600E8D0[]; +extern Gfx D_060119B0[]; +extern Gfx D_0600DC40[]; +extern Gfx D_0600DB60[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s") +void BgJyaBombchuiwa_SetupCollider(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s") + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, &this->colliderItems); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s") +void BgJyaBombchuiwa_SetDrawFlags(BgJyaBombchuiwa* this, u8 drawFlags) { + this->drawFlags &= ~7; + this->drawFlags |= drawFlags; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s") +void BgJyaBombchuiwa_Init(Actor* thisx, GlobalContext* globalCtx) { + BgJyaBombchuiwa* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s") + Actor_ProcessInitChain(thisx, &sInitChain); + BgJyaBombchuiwa_SetupCollider(thisx, globalCtx); + if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { + BgJyaBombchuiwa_SpawnLightRay(this, globalCtx); + } else { + BgJyaBombchuiwa_SetupWaitForExplosion(this, globalCtx); + } + Actor_SetHeight(thisx, 0.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s") +void BgJyaBombchuiwa_Destroy(Actor* thisx, GlobalContext* globalCtx) { + Collider_DestroyJntSph(globalCtx, &THIS->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s") +void BgJyaBombchuiwa_Break(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f velocity; + s16 scale; + s16 arg5; + s16 arg6; + s16 arg7; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s") + for (i = 0; i < 20; i++) { + pos.x = Math_Rand_ZeroOne() * 10.0f + this->actor.posRot.pos.x - 10.0f; + pos.y = Math_Rand_ZeroOne() * 40.0f + this->actor.posRot.pos.y - 20.0f; + pos.z = Math_Rand_ZeroOne() * 50.0f + this->actor.posRot.pos.z - 25.0f; + velocity.x = Math_Rand_ZeroOne() * 3.0f - 0.3f; + velocity.y = Math_Rand_ZeroOne() * 18.0f; + velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; + scale = (s32)(Math_Rand_ZeroOne() * 20.0f) + 1; + if (scale > 10) { + arg5 = 5; + } else { + arg5 = 1; + } + if (Math_Rand_ZeroOne() < 0.4f) { + arg5 |= 0x40; + arg6 = 0xC; + arg7 = 8; + } else { + arg5 |= 0x20; + arg6 = 0xC; + arg7 = 8; + if (scale < 8) { + arg6 = 0x46; + arg7 = 0x28; + } + } + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -300, arg5, arg6, arg7, 0, scale, 1, 15, 80, + KAKERA_COLOR_NONE, OBJECT_JYA_OBJ, D_0600EDC0); + } + func_80033480(globalCtx, &this->actor.posRot.pos, 100.0f, 8, 100, 160, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s") +void BgJyaBombchuiwa_SetupWaitForExplosion(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { + this->actionFunc = BgJyaBombchuiwa_WaitForExplosion; + BgJyaBombchuiwa_SetDrawFlags(this, 3); + this->timer = 0; +} + +void BgJyaBombchuiwa_WaitForExplosion(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { + if ((this->collider.base.acFlags & 2) || (this->timer > 0)) { + if (this->timer == 0) { + func_800800F8(globalCtx, 3410, -99, &this->actor, 0); + } + this->timer++; + if (this->timer > 10) { + BgJyaBombchuiwa_Break(this, globalCtx); + BgJyaBombchuiwa_CleanUpAfterExplosion(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_WALL_BROKEN); + } + } else { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + } +} + +void BgJyaBombchuiwa_CleanUpAfterExplosion(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { + this->actionFunc = func_808949B8; + BgJyaBombchuiwa_SetDrawFlags(this, 4); + this->lightRayIntensity = 0.3f; + this->timer = 0; + this->actor.flags &= ~1; +} + +void func_808949B8(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { + this->timer++; + if (this->timer & 4) { + func_80033480(globalCtx, &this->actor.posRot.pos, 60.0f, 3, 100, 100, 0); + } + if (Math_ApproxF(&this->lightRayIntensity, 1.0f, 0.028)) { + BgJyaBombchuiwa_SpawnLightRay(this, globalCtx); + } +} + +void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { + this->actionFunc = NULL; + this->lightRayIntensity = 153.0f; + BgJyaBombchuiwa_SetDrawFlags(this, 4); + if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_MIR_RAY, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, 0, 0, 0) == NULL) { + // Occurrence failure + osSyncPrintf("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombchuiwa.c", 410, + this->actor.params); + } +} + +void BgJyaBombchuiwa_Update(Actor* thisx, GlobalContext* globalCtx) { + BgJyaBombchuiwa* this = THIS; + + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void BgJyaBombchuiwa_DrawRock(GlobalContext* globalCtx) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 436); + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 439), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_060119B0); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 443); +} + +void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) { + BgJyaBombchuiwa* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 453); + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 457), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, CLAMP_MAX((u32)(this->lightRayIntensity * 153.0f), 153)); + gSPDisplayList(POLY_XLU_DISP++, D_0600DC40); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, CLAMP_MAX((u32)(this->lightRayIntensity * 255.0f), 255)); + gSPDisplayList(POLY_XLU_DISP++, D_0600DB60); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 472); +} + +void BgJyaBombchuiwa_Draw(Actor* thisx, GlobalContext* globalCtx) { + static Vec3f D_80894F88 = { -920.0f, 480.0f, -889.0f }; + static Vec3s D_80894F94 = { 0, 0, 0 }; + BgJyaBombchuiwa* this = THIS; + + if (this->drawFlags & 1) { + Gfx_DrawDListOpa(globalCtx, &D_0600E8D0); + func_800628A4(0, &this->collider); + } + + if (this->drawFlags & 2) { + BgJyaBombchuiwa_DrawRock(globalCtx); + } + if (this->drawFlags & 4) { + func_800D1694(D_80894F88.x, D_80894F88.y, D_80894F88.z, &D_80894F94); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + if (this->drawFlags & 4) { + BgJyaBombchuiwa_DrawLight(thisx, globalCtx); + } + } +} diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h index 2f9069976e..d9e9a2353a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h @@ -6,9 +6,16 @@ struct BgJyaBombchuiwa; +typedef void (*BgJyaBombchuiwaActionFunc)(struct BgJyaBombchuiwa*, GlobalContext*); + typedef struct BgJyaBombchuiwa { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x6C]; + /* 0x014C */ BgJyaBombchuiwaActionFunc actionFunc; + /* 0x0150 */ ColliderJntSph collider; + /* 0x0170 */ ColliderJntSphItem colliderItems; + /* 0x01B0 */ f32 lightRayIntensity; + /* 0x01B4 */ s16 timer; + /* 0x01B6 */ u8 drawFlags; // Used to determine how the actor is drawn. } BgJyaBombchuiwa; // size = 0x01B8 extern const ActorInit Bg_Jya_Bombchuiwa_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index e2d3308c32..35a5d5e3ea 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -295,11 +295,11 @@ void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 706); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sRightSideCrumbles[this->crumbleIndex])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sLeftSideCrumbles[this->crumbleIndex])); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 716), + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRightSideCrumbles[this->crumbleIndex])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sLeftSideCrumbles[this->crumbleIndex])); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 716), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06005780); + gSPDisplayList(POLY_OPA_DISP++, D_06005780); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 720); } @@ -323,9 +323,9 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) { Matrix_Translate(sPiecesInit[i].unk_00.x * -10.0f, sPiecesInit[i].unk_00.y * -10.0f, sPiecesInit[i].unk_00.z * -10.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 778), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 778), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists[i]); + gSPDisplayList(POLY_OPA_DISP++, sDLists[i]); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 783); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 1958590907..fa149001a4 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -112,18 +112,18 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 292); func_80093D84(globalCtx->state.gfxCtx); if (Flags_GetSwitch(globalCtx, this->actor.params)) { - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 200, 0, 0, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 255); } else if (this->framesUntilDisable == -1) { - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 200, 0, 0, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 0); } else { - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 200, 0, 0, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 255); } Matrix_Translate(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0); Matrix_RotateRPY(this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, 1); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 331), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 331), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06002D20); + gSPDisplayList(POLY_XLU_DISP++, D_06002D20); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 335); } diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index e498b4c711..d626c9264c 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -332,18 +332,18 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, + gSPSegment(POLY_XLU_DISP++, 0x0C, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, 0, -gameplayFrames * 1, 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 749), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 749), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 255, 255, 128); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 102); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 102); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06004B20); + gSPDisplayList(POLY_XLU_DISP++, D_06004B20); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 756); } diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index c7b424313b..0fdc7414d0 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -109,15 +109,15 @@ void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) { if (objBankIndex >= 0) { gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment); } - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06000000)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06000000)); dlist = D_06000330; } else { dlist = D_06000140; } func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, dlist); + gSPDisplayList(POLY_OPA_DISP++, dlist); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index cef037edc1..e4ae646b7b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -251,11 +251,11 @@ void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 541); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 548), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 548), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001E50); + gSPDisplayList(POLY_OPA_DISP++, D_06001E50); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 553); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 508ddaf87b..5cc513f853 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -260,10 +260,10 @@ void BgMoriElevator_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 575); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 580), + gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 580), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06002AD0); + gSPDisplayList(POLY_OPA_DISP++, D_06002AD0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 584); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 1cc010c078..5561c50767 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -278,17 +278,17 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 516); func_80093D18(globalCtx->state.gfxCtx); if (1) {} - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 521), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 521), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); switch (this->dyna.actor.params) { case -1: - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06004770); + gSPDisplayList(POLY_OPA_DISP++, D_06004770); break; case 0: - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060036B0); + gSPDisplayList(POLY_OPA_DISP++, D_060036B0); break; } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 531); diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 2d7f3dfd7a..d7d7bf83f2 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -168,11 +168,11 @@ void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 339); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 344), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 344), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDisplayLists[this->dyna.actor.params]); + gSPDisplayList(POLY_OPA_DISP++, sDisplayLists[this->dyna.actor.params]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 348); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 4fd3f2ce12..fbe3ab01e0 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -235,10 +235,10 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 611); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIdx].segment); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 618), + gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIdx].segment); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 618), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists[this->dyna.actor.params]); + gSPDisplayList(POLY_OPA_DISP++, sDLists[this->dyna.actor.params]); if (this->boxObjIdx > 0) { Matrix_Get(&mtx); } @@ -251,21 +251,21 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) { } Matrix_RotateRPY(0, -0x8000, this->dyna.actor.shape.rot.z, MTXMODE_APPLY); Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 652), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 652), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_04049FE0); + gSPDisplayList(POLY_OPA_DISP++, D_04049FE0); } if ((this->boxObjIdx > 0) && ((this->boxObjIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_BOX)) > 0) && (Object_IsLoaded(&globalCtx->objectCtx, this->boxObjIdx))) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->boxObjIdx].segment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->boxObjIdx].segment); + gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]); Matrix_Put(&mtx); Matrix_Translate(147.0f, -245.0f, -453.0f, MTXMODE_APPLY); Matrix_RotateY(1.5707964f, MTXMODE_APPLY); Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 689), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 689), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000AE8); + gSPDisplayList(POLY_OPA_DISP++, D_06000AE8); Matrix_Put(&mtx); Matrix_Translate(167.0f, -218.0f, -453.0f, MTXMODE_APPLY); if (Flags_GetTreasure(globalCtx, 0xE)) { @@ -274,9 +274,9 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ(M_PI, MTXMODE_APPLY); } Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 703), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 703), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001678); + gSPDisplayList(POLY_OPA_DISP++, D_06001678); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 709); diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index fdb4c03342..2e6fdded9c 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -169,18 +169,18 @@ void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 360), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 360), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + gSPSegment(POLY_XLU_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 128); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 128); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0x7F - (gameplayFrames & 0x7F), gameplayFrames % 0x80, 0x20, 0x20, 1, gameplayFrames & 0x7F, gameplayFrames % 0x80, 0x20, 0x20)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_060049D0); + gSPDisplayList(POLY_XLU_DISP++, D_060049D0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 382); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index be091d9faa..5b676eb098 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -168,12 +168,12 @@ void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 347); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 352), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 352), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060056B0); + gSPDisplayList(POLY_OPA_DISP++, D_060056B0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 356); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 812fba0ff3..4c32aa6395 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -229,12 +229,12 @@ void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 497); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 502), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 502), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06007690); + gSPDisplayList(POLY_OPA_DISP++, D_06007690); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 506); } diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index cbf23f1937..08c5aaa041 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -598,11 +598,11 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) { } else { alpha = this->timer; } - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 255, 255, 255, alpha); + gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, alpha); } - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1501), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1501), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, displayLists[this->type]); + gSPDisplayList(POLY_OPA_DISP++, displayLists[this->type]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1508); if ((this->type == 0) || (this->type == 1)) { diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 1d84919ee0..abce92f52b 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -141,9 +141,9 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 315); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 319), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 319), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060003A0); + gSPDisplayList(POLY_OPA_DISP++, D_060003A0); if (Flags_GetSwitch(globalCtx, this->actor.params)) { Color_RGBA8* primColor = &sPrimColors[this->flameColor]; @@ -158,21 +158,21 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { Lights_PointSetColorAndRadius(&this->lightInfo, red, green, blue, 200); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (this->flameTextureScroll * -20) & 0x1FF, 32, 128)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, primColor->r, primColor->g, primColor->b, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, envColor->r, envColor->g, envColor->b, 255); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, primColor->r, primColor->g, primColor->b, 255); + gDPSetEnvColor(POLY_XLU_DISP++, envColor->r, envColor->g, envColor->b, 255); Matrix_Translate(0.0f, 52.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) - this->actor.shape.rot.y + 0x8000) * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(0.0027f, 0.0027f, 0.0027f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 368), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 368), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 373); } diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index ed101fd6d6..07cdf29c27 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -84,9 +84,9 @@ void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_06000000); + gSPDisplayList(POLY_OPA_DISP++, &D_06000000); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index cf08b33ebf..fad63612c9 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -82,9 +82,9 @@ void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 214), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 214), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000100); + gSPDisplayList(POLY_OPA_DISP++, D_06000100); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 3e16fabfd7..bace776630 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -329,10 +329,10 @@ void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) { func_80093D18(localGfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(localGfxCtx, "../z_bg_spot01_idohashira.c", 699), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, "../z_bg_spot01_idohashira.c", 699), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_808AAF34(this, globalCtx); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000420); + gSPDisplayList(POLY_OPA_DISP++, D_06000420); CLOSE_DISPS(localGfxCtx, "../z_bg_spot01_idohashira.c", 708); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 7d424c55c8..22fa4dc354 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -76,15 +76,15 @@ void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idomizu.c", 232), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idomizu.c", 232), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); frames = globalCtx->state.frames; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - frames % 128, frames & 0x7F, 32, 32, 1, frames % 128, frames & 0x7F, 32, 32)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_060007D0); + gSPDisplayList(POLY_XLU_DISP++, D_060007D0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idomizu.c", 244); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 5b584161ef..9a87e8f6bd 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -78,9 +78,9 @@ void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 166), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 166), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_06003B20); + gSPDisplayList(POLY_OPA_DISP++, &D_06003B20); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171); } diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index ec01d4ddd4..36fe102fe7 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -132,30 +132,30 @@ void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 325), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 325), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); gSPSegment( - oGfxCtx->polyXlu.p++, 0x08, + POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames * 5, 64, 64, 1, 0, gameplayFrames * 5, 64, 64)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000B20); + gSPDisplayList(POLY_XLU_DISP++, D_06000B20); if (this->bufferIndex == 0) { - gSPVertex(oGfxCtx->polyXlu.p++, D_06000800, 25, 0); + gSPVertex(POLY_XLU_DISP++, D_06000800, 25, 0); } else { - gSPVertex(oGfxCtx->polyXlu.p++, D_06000990, 25, 0); + gSPVertex(POLY_XLU_DISP++, D_06000990, 25, 0); } - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000BC0); + gSPDisplayList(POLY_XLU_DISP++, D_06000BC0); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 3, 64, 64, 1, -gameplayFrames, gameplayFrames * 3, 64, 64)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06001580); + gSPDisplayList(POLY_XLU_DISP++, D_06001580); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 358); diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 60623e86da..482f3e37a8 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -174,9 +174,9 @@ void BgSpot09Obj_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06008010); + gSPDisplayList(POLY_XLU_DISP++, D_06008010); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); } diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 48d2473bc6..00f15da908 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -1,4 +1,5 @@ #include "z_bg_spot11_oasis.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x00000010 @@ -6,8 +7,14 @@ void BgSpot11Oasis_Init(Actor* thisx, GlobalContext* globalCtx); void BgSpot11Oasis_Update(Actor* thisx, GlobalContext* globalCtx); +void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx); +void func_808B2970(BgSpot11Oasis* this); +void func_808B2980(BgSpot11Oasis* this, GlobalContext* globalCtx); +void func_808B29E0(BgSpot11Oasis* this); +void func_808B29F0(BgSpot11Oasis* this, GlobalContext* globalCtx); +void func_808B2AA8(BgSpot11Oasis* this); +void func_808B2AB8(BgSpot11Oasis* this, GlobalContext* globalCtx); -/* const ActorInit Bg_Spot11_Oasis_InitVars = { ACTOR_BG_SPOT11_OASIS, ACTORTYPE_BG, @@ -19,25 +26,135 @@ const ActorInit Bg_Spot11_Oasis_InitVars = { (ActorFunc)BgSpot11Oasis_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s") +s16 D_808B2E10[][2] = { + { 1260, 2040 }, { 1259, 1947 }, { 1135, 1860 }, { 1087, 1912 }, { 1173, 2044 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s") +Vec3f D_808B2E34[] = { + { 0.0f, -100.0f, 0.0f }, { 100.0f, -80.0f, -50.0f }, { -50.0f, -80.0f, -100.0f }, + { -75.0f, -90.0f, 90.0f }, { 30.0f, -100.0f, 40.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s") +extern Gfx D_06000870[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s") +void func_808B27F0(GlobalContext* globalCtx, s16 arg1) { + WaterBox* waterBox = &globalCtx->colCtx.stat.colHeader->waterBoxes[0]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s") + waterBox->unk_02 = arg1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s") +s32 func_808B280C(GlobalContext* globalCtx) { + Player* player = PLAYER; + Vec3f sp58; + Vec3f sp4C; + Vec3f sp40; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s") + sp58.x = D_808B2E10[0][0]; + sp58.z = D_808B2E10[0][1]; + sp58.y = 0.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s") + sp4C.y = 0.0f; + sp40.y = 0.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s") + for (i = 1; i < ARRAY_COUNT(D_808B2E10) - 1; i++) { + sp4C.x = D_808B2E10[i][0]; + sp4C.z = D_808B2E10[i][1]; + sp40.x = D_808B2E10[i + 1][0]; + sp40.z = D_808B2E10[i + 1][1]; + if (Math3D_TriChkPointParaYSlopedY(&sp58, &sp4C, &sp40, player->actor.posRot.pos.z, + player->actor.posRot.pos.x)) { + return 1; + } + } + return 0; +} + +void BgSpot11Oasis_Init(Actor* thisx, GlobalContext* globalCtx) { + BgSpot11Oasis* this = THIS; + + Actor_ProcessInitChain(&this->actor, sInitChain); + func_808B2970(this); + this->actor.posRot.pos.y = -100.0f; + func_808B27F0(globalCtx, -100); +} + +void func_808B2970(BgSpot11Oasis* this) { + this->actionFunc = func_808B2980; +} + +void func_808B2980(BgSpot11Oasis* this, GlobalContext* globalCtx) { + if (Flags_GetEnv(globalCtx, 5) && func_808B280C(globalCtx)) { + func_800800F8(globalCtx, 0x1036, -99, &this->actor, 0); + func_808B29E0(this); + } +} + +void func_808B29E0(BgSpot11Oasis* this) { + this->actionFunc = func_808B29F0; +} + +void func_808B29F0(BgSpot11Oasis* this, GlobalContext* globalCtx) { + if (Math_ApproxF(&this->actor.posRot.pos.y, 0.0f, 0.7f)) { + func_808B2AA8(this); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_SPAWNER); + func_80078884(NA_SE_SY_CORRECT_CHIME); + } + func_808B27F0(globalCtx, this->actor.posRot.pos.y); +} + +void func_808B2AA8(BgSpot11Oasis* this) { + this->actionFunc = func_808B2AB8; +} + +void func_808B2AB8(BgSpot11Oasis* this, GlobalContext* globalCtx) { +} + +void BgSpot11Oasis_Update(Actor* thisx, GlobalContext* globalCtx) { + BgSpot11Oasis* this = THIS; + s32 pad; + u32 gameplayFrames; + Vec3f sp30; + + this->actionFunc(this, globalCtx); + if (this->actionFunc == func_808B2980) { + this->actor.draw = NULL; + return; + } + this->actor.draw = BgSpot11Oasis_Draw; + if (this->unk_150 && (this->actor.projectedPos.z < 400.0f) && (this->actor.projectedPos.z > -40.0f)) { + gameplayFrames = globalCtx->gameplayFrames; + if (gameplayFrames & 4) { + Math_Vec3f_Sum(&this->actor.posRot.pos, &D_808B2E34[this->unk_151], &sp30); + EffectSsBubble_Spawn(globalCtx, &sp30, 0.0f, 15.0f, 50.0f, (Math_Rand_ZeroOne() * 0.12f) + 0.02f); + if (Math_Rand_ZeroOne() < 0.3f) { + this->unk_151 = Math_Rand_ZeroOne() * 4.9f; + } + } + } else { + this->unk_150 = 1; + } +} + +void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx) { + u32 gameplayFrames = globalCtx->gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 327); + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 331), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, + 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + gSPDisplayList(POLY_XLU_DISP++, D_06000870); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 346); +} diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h index 7f76bf30e4..70bdf82a5b 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h @@ -6,9 +6,13 @@ struct BgSpot11Oasis; +typedef void (*BgSpot11OasisActionFunc)(struct BgSpot11Oasis*, GlobalContext*); + typedef struct BgSpot11Oasis { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x8]; + /* 0x014C */ BgSpot11OasisActionFunc actionFunc; + /* 0x0150 */ u8 unk_150; + /* 0x0151 */ u8 unk_151; } BgSpot11Oasis; // size = 0x0154 extern const ActorInit Bg_Spot11_Oasis_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index cc81638051..6d959072fd 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -99,9 +99,9 @@ void BgSpot15Saku_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_060003C0); + gSPDisplayList(POLY_XLU_DISP++, D_060003C0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); } diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 707b898e6a..3c73b7a09d 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -512,16 +512,16 @@ void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1257), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1257), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params == 0xFF) { // The boulder is intact - gSPDisplayList(oGfxCtx->polyOpa.p++, this->unk_150); + gSPDisplayList(POLY_OPA_DISP++, this->unk_150); } else { // The boulder is debris - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->bombiwaBankIndex].segment); - gSPDisplayList(oGfxCtx->polyOpa.p++, this->unk_150); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->bombiwaBankIndex].segment); + gSPDisplayList(POLY_OPA_DISP++, this->unk_150); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1274); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 3f38bc6b94..afde11bf87 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -131,18 +131,18 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 213), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 213), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->fireFlag & 1) { gSPSegment( - oGfxCtx->polyXlu.p++, 0x08, + POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * (-1), 0, 16, 32, 1, scroll, scroll * (-2), 16, 32)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, this->envColorAlpha); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000660); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, this->envColorAlpha); + gSPDisplayList(POLY_XLU_DISP++, D_06000660); } else { - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 255, 255, this->envColorAlpha); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 255); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000FC0); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); + gSPDisplayList(POLY_XLU_DISP++, D_06000FC0); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 238); @@ -156,11 +156,11 @@ void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 248), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 248), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 255, 255, this->envColorAlpha); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 255); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000FC0); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); + gSPDisplayList(POLY_XLU_DISP++, D_06000FC0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 256); } diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 5b7545557f..ce61789534 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -135,15 +135,15 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 273), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 273), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); r = (r >> 1) + 0xC0; g = (g >> 1) + 0xC0; - gDPSetEnvColor(oGfxCtx->polyOpa.p++, r, g, 255, 128); + gDPSetEnvColor(POLY_OPA_DISP++, r, g, 255, 128); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060008A0); + gSPDisplayList(POLY_OPA_DISP++, D_060008A0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 283); @@ -151,9 +151,9 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 290), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 290), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000960); + gSPDisplayList(POLY_XLU_DISP++, D_06000960); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 295); } diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index c6cc434fb3..79ec52af9d 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -62,12 +62,12 @@ void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) - thisx->shape.rot.y + 0x8000) * 9.58738019108e-05f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 161), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 161), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20, 1, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000B40); + gSPDisplayList(POLY_XLU_DISP++, D_06000B40); if (1) {} diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index fe33a54894..5a4cebe0be 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -163,11 +163,11 @@ void BgTokiSwd_Draw(Actor* thisx, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx2, 0); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx2->state.gfxCtx, 0, -(globalCtx2->gameplayFrames % 0x80), 32, 32)); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx2->state.gfxCtx, "../z_bg_toki_swd.c", 742), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx2->state.gfxCtx, "../z_bg_toki_swd.c", 742), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001BD0); + gSPDisplayList(POLY_OPA_DISP++, D_06001BD0); CLOSE_DISPS(globalCtx2->state.gfxCtx, "../z_bg_toki_swd.c", 776); } diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 616c64a9db..5768be9f9a 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -243,10 +243,10 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { alpha = (globalCtx->unk_11D30[0] + 0x1F4); } - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 128, 128, 128, alpha * 0.1f); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 932), + gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, alpha * 0.1f); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 932), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_060009D0); + gSPDisplayList(POLY_OPA_DISP++, &D_060009D0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 937); } diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index c970724bed..938ce8457d 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -198,13 +198,13 @@ void BgYdanHasi_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 577); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (0 - globalCtx->gameplayFrames & 0x7F), globalCtx->gameplayFrames & 0x7F, 0x20, 0x20, 1, globalCtx->gameplayFrames & 0x7F, globalCtx->gameplayFrames & 0x7F, 0x20, 0x20)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 592), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 592), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_06005DE0); + gSPDisplayList(POLY_XLU_DISP++, &D_06005DE0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 597); } diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index f0090ba1f5..15a1b133f0 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -132,9 +132,9 @@ void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { OPEN_DISPS(localGfxCtx, "../z_bg_zg.c", 311); func_80093D18(localGfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(localGfxCtx, "../z_bg_zg.c", 315), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, "../z_bg_zg.c", 315), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001080); + gSPDisplayList(POLY_OPA_DISP++, D_06001080); CLOSE_DISPS(localGfxCtx, "../z_bg_zg.c", 320); } diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 2b9eda1388..2a35e075d5 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -79,10 +79,10 @@ void func_80977EA8(GlobalContext* globalCtx, Gfx* dlist) { func_80093D18(gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, dlist); - gSPPopMatrix(oGfxCtx->polyOpa.p++, G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, dlist); + gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); CLOSE_DISPS(gfxCtx, "../z_demo_geff.c", 188); } @@ -94,7 +94,7 @@ void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { OPEN_DISPS(gfxCtx, "../z_demo_geff.c", 204); - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment); // Necessary to match diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 0fdba9cf02..4a39e3313f 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -338,8 +338,8 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_go.c", 732); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(srcSegment9)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(srcSegment9)); SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 919cd22d40..7bae32f442 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -531,13 +531,13 @@ void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp68)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp68)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->unk_26C); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp68)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp68)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_26C); + gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]); - oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, - skelAnime->dListCount, NULL, NULL, NULL, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_im_inKenjyanomaDemo02.c", 308); } @@ -1193,10 +1193,10 @@ void func_80987658(DemoIm* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp68)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp68)); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp68)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp68)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, func_80987514, func_809875C0, &this->actor); diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index ca22a7c17c..fb044f31a0 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -5,6 +5,7 @@ */ #include "z_demo_sa.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "vt.h" @@ -462,14 +463,14 @@ void func_8098F1C0(DemoSa* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, D_80116280); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_XLU_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha); + gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280); - oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, - skelAnime->dListCount, NULL, NULL, NULL, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_sa_inKenjyanomaDemo02.c", 325); } @@ -605,7 +606,7 @@ void func_8098F83C(DemoSa* this, GlobalContext* globalCtx) { SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_0601113C, NULL, NULL, 0); Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z, - 0, 0, 0, 3); + 0, 0, 0, FAIRY_KOKIRI); this->action = 16; this->drawConfig = 0; this->actor.shape.unk_14 = 0; @@ -801,11 +802,11 @@ void func_8098FEB4(DemoSa* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp70)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, DemoSa_OverrideLimbDraw, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 518284760e..909c4fe72f 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -109,20 +109,20 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_shd.c", 729), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_shd.c", 729), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_809932D0); + gSPDisplayList(POLY_XLU_DISP++, D_809932D0); if (this->unk_14C & 1) { - gSPDisplayList(oGfxCtx->polyXlu.p++, + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF), 16, 256, 1, 0, 255 - ((unk_14E * 5) & 255), 32, 32)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_80993390); + gSPDisplayList(POLY_XLU_DISP++, D_80993390); } else if (this->unk_14C & 2) { - gSPDisplayList(oGfxCtx->polyXlu.p++, + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF), 16, 256, 1, 0, 255 - ((unk_14E * 5) & 255), 32, 32)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_809934B8); + gSPDisplayList(POLY_XLU_DISP++, D_809934B8); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_shd.c", 762); diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index f2277a98e2..872b07c9d7 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -164,9 +164,9 @@ void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_ana.c", 440); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_05001390); + gSPDisplayList(POLY_XLU_DISP++, D_05001390); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_ana.c", 449); } diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index ec4d23211e..b670003581 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -114,9 +114,9 @@ void func_8099485C(DoorGerudo* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] <= 0) { - player->naviMessageId = -0x203; + player->naviTextId = -0x203; } else if (!Flags_GetCollectible(globalCtx, (this->dyna.actor.params >> 8) & 0x1F)) { - player->naviMessageId = -0x225; + player->naviTextId = -0x225; } else { player->doorType = 2; player->doorDirection = direction; @@ -153,9 +153,9 @@ void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 365), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 365), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000040); + gSPDisplayList(POLY_OPA_DISP++, D_06000040); if (this->unk_166 != 0) { Matrix_Scale(0.01f, 0.01f, 0.025f, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index a804a2b54b..fd5e8ec43b 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -179,8 +179,8 @@ void ElfMsg_CallNaviCuboid(ElfMsg* this, GlobalContext* globalCtx) { (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) && ((player->actor.posRot.pos.y - this->actor.posRot.pos.y) < (100.0f * this->actor.scale.y)) && (fabsf(player->actor.posRot.pos.z - this->actor.posRot.pos.z) < (100.0f * this->actor.scale.z))) { - player->naviMessageId = ElfMsg_GetMessageId(this); - navi->unk_298 = &this->actor; + player->naviTextId = ElfMsg_GetMessageId(this); + navi->elfMsg = this; } } @@ -195,8 +195,8 @@ void ElfMsg_CallNaviCylinder(ElfMsg* this, GlobalContext* globalCtx) { if (ElfMsg_WithinXZDistance(&player->actor.posRot.pos, &this->actor.posRot.pos, this->actor.scale.x * 100.0f) && (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) && ((player->actor.posRot.pos.y - this->actor.posRot.pos.y) < (100.0f * this->actor.scale.y))) { - player->naviMessageId = ElfMsg_GetMessageId(this); - navi->unk_298 = &this->actor; + player->naviTextId = ElfMsg_GetMessageId(this); + navi->elfMsg = this; } } @@ -227,19 +227,19 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); if (thisx->params & 0x8000) { - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 100, 100, R_NAVI_MSG_REGION_ALPHA); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 100, 100, R_NAVI_MSG_REGION_ALPHA); } else { - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA); } - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg.c", 448), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg.c", 448), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_809AD278); + gSPDisplayList(POLY_XLU_DISP++, D_809AD278); if (thisx->params & 0x4000) { - gSPDisplayList(oGfxCtx->polyXlu.p++, D_809AD4B8); + gSPDisplayList(POLY_XLU_DISP++, D_809AD4B8); } else { - gSPDisplayList(oGfxCtx->polyXlu.p++, D_809AD3B8); + gSPDisplayList(POLY_XLU_DISP++, D_809AD3B8); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 457); diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 3167138b41..bceb2ff91f 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -187,11 +187,11 @@ void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) { } func_80093D18(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 100, 100, 255, R_NAVI_MSG_REGION_ALPHA); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 362), + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 100, 255, R_NAVI_MSG_REGION_ALPHA); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 362), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_809ADC38); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_809ADCF8); + gSPDisplayList(POLY_XLU_DISP++, D_809ADC38); + gSPDisplayList(POLY_XLU_DISP++, D_809ADCF8); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 367); } diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 0ce750ef04..fc4da1ebb4 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -319,7 +319,7 @@ void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800943C8(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_809B0F80[this->unk_2AC])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809B0F80[this->unk_2AC])); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnAni_OverrideLimbDraw, EnAni_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 11b0b5f242..c720966ed0 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -359,9 +359,9 @@ void EnAttackNiw_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.xyzDistFromLinkSq < SQ(tmpf1)) { cucco = (EnNiw*)this->actor.parent; if ((this->actor.parent->update != NULL) && (this->actor.parent != NULL) && (cucco != NULL) && - (cucco->unk_26A == 0) && (player->invincibilityTimer == 0)) { + (cucco->timer9 == 0) && (player->invincibilityTimer == 0)) { func_8002F6D4(globalCtx, &this->actor, 2.0f, this->actor.posRot.rot.y, 0.0f, 0x10); - cucco->unk_26A = 0x46; + cucco->timer9 = 0x46; } } if (this->unk_25E == 0) { diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 5129b1a23f..9c6e0b945f 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -144,9 +144,9 @@ void func_809C2324(GlobalContext* globalCtx, Gfx* dList, s32 alpha) { segment = D_809C25A0; } - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, segment); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, alpha); - gSPDisplayList(oGfxCtx->polyXlu.p++, dList); + gSPSegment(POLY_XLU_DISP++, 0x08, segment); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, alpha); + gSPDisplayList(POLY_XLU_DISP++, dList); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 330); } @@ -163,9 +163,9 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames % 128; - gSPSegment(oGfxCtx->polyXlu.p++, 0x0D, + gSPSegment(POLY_XLU_DISP++, 0x0D, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames, 0, 32, 32, 1, gameplayFrames, 0, 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 363), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 363), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->unk_164 != 0) { diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 1f44c3508e..23367ccd95 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -340,16 +340,16 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800D1FD4(&globalCtx->mf_11DA0); func_8002EBCC(thisx, globalCtx, 0); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 928), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 928), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_04007A50); + gSPDisplayList(POLY_OPA_DISP++, D_04007A50); Matrix_RotateRPY(0x4000, 0, 0, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 934), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 934), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, (s16)this->flashIntensity, 0, 40, 255); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, (s16)this->flashIntensity, 0, 40, 255); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_04007860); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 0, 40, 255); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, (s16)this->flashIntensity, 0, 40, 255); + gSPDisplayList(POLY_OPA_DISP++, D_04007860); func_800628A4(0, &this->explosionCollider); } diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 088e1385a8..e1c7288696 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -464,23 +464,23 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); if (thisx->params != BOMBFLOWER_BODY) { - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1041), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1041), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000340); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000530); + gSPDisplayList(POLY_OPA_DISP++, D_06000340); + gSPDisplayList(POLY_OPA_DISP++, D_06000530); Matrix_Translate(0.0f, 1000.0f, 0.0f, MTXMODE_APPLY); Matrix_Scale(this->flowerBombScale, this->flowerBombScale, this->flowerBombScale, MTXMODE_APPLY); } - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 200, 255, 200, 255); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, (s16)this->flashIntensity, 20, 10, 0); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1054), + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 200, 255, 200, 255); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 20, 10, 0); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1054), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(EnBombf_NewMtxDList(globalCtx->state.gfxCtx, globalCtx))); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000408); + gSPDisplayList(POLY_OPA_DISP++, D_06000408); } else { func_800628A4(0, &this->explosionCollider); } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 246660c8fe..711a7c56b1 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -258,9 +258,9 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); Matrix_RotateY((this->activeTimer * 12000) * 0.0000958738f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_boom.c", 601), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_boom.c", 601), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_0400C808); + gSPDisplayList(POLY_OPA_DISP++, D_0400C808); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_boom.c", 604); } diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index c18292c2c7..f8756882fb 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -641,23 +641,23 @@ void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) { */ if ((this->alpha == 255 && !(this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6)) || ((this->dyna.actor.flags & 0x80) != 0x80 && (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6))) { - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, EnBox_EmptyDList(globalCtx->state.gfxCtx)); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x08, EnBox_EmptyDList(globalCtx->state.gfxCtx)); func_80093D18(globalCtx->state.gfxCtx); - oGfxCtx->polyOpa.p = SkelAnime_Draw2(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, - EnBox_PostLimbDraw, &this->dyna.actor, oGfxCtx->polyOpa.p); + POLY_OPA_DISP = SkelAnime_Draw2(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, + EnBox_PostLimbDraw, &this->dyna.actor, POLY_OPA_DISP); } else if (this->alpha != 0) { - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); func_80093D84(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha); if (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6) { - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, func_809CA518(globalCtx->state.gfxCtx)); + gSPSegment(POLY_XLU_DISP++, 0x08, func_809CA518(globalCtx->state.gfxCtx)); } else { - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, func_809CA4A0(globalCtx->state.gfxCtx)); + gSPSegment(POLY_XLU_DISP++, 0x08, func_809CA4A0(globalCtx->state.gfxCtx)); } - oGfxCtx->polyXlu.p = SkelAnime_Draw2(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, - EnBox_PostLimbDraw, &this->dyna.actor, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = SkelAnime_Draw2(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, + EnBox_PostLimbDraw, &this->dyna.actor, POLY_XLU_DISP); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_box.c", 1639); diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 000dffddf2..e80c259741 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -5,6 +5,7 @@ */ #include "z_en_butte.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x00000000 @@ -117,11 +118,11 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) { func_800D1694(this->actor.posRot2.pos.x + sp5C.x, this->actor.posRot2.pos.y + sp5C.y, this->actor.posRot2.pos.z + sp5C.z, &camDir); Matrix_Scale(sTransformationEffectScale, sTransformationEffectScale, sTransformationEffectScale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_choo.c", 317), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_choo.c", 317), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 200, 200, 180, alpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 200, 200, 210, 255); - gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(&D_04010130)); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_04010130)); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_choo.c", 326); } @@ -347,7 +348,7 @@ void EnButte_TransformIntoFairy(EnButte* this, GlobalContext* globalCtx) { Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 60, NA_SE_EV_BUTTERFRY_TO_FAIRY); } else if (this->timer == 4) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot2.pos.x, this->actor.posRot2.pos.y, - this->actor.posRot2.pos.z, 0, this->actor.shape.rot.y, 0, 2); + this->actor.posRot2.pos.z, 0, this->actor.shape.rot.y, 0, FAIRY_HEAL_TIMED); this->drawSkelAnime = false; } else if (this->timer <= 0) { EnButte_SetupWaitToDie(this); diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index b70a929248..be6f53b71f 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -179,12 +179,12 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, mtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_809D2560[this->actor.params & 0x7F])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, + gSPSegment(POLY_OPA_DISP++, 0x0C, mtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809D2560[this->actor.params & 0x7F])); + gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0, (globalCtx->gameplayFrames * -10) % 128, 32, 32)); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bx.c", 478), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bx.c", 478), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params & 0x80) { @@ -209,7 +209,7 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_ToMtx(mtx, "../z_en_bx.c", 507); } - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060022F0); + gSPDisplayList(POLY_OPA_DISP++, D_060022F0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bx.c", 511); } diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index ddae36cb9b..509004750d 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -456,8 +456,8 @@ void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, colors[this->actor.params & 0xF].r, colors[this->actor.params & 0xF].g, + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, colors[this->actor.params & 0xF].r, colors[this->actor.params & 0xF].g, colors[this->actor.params & 0xF].b, colors[this->actor.params & 0xF].a); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 98e8b88822..3c366c4657 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -114,17 +114,17 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(gfxCtx, "../z_en_dy_extra.c", 294); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames * 2, 0, 0x20, 0x40, 1, globalCtx->state.frames, globalCtx->state.frames * -8, 0x10, 0x10)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dy_extra.c", 307), + gDPPipeSync(POLY_XLU_DISP++); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dy_extra.c", 307), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0x80, primColors[this->type].r, primColors[this->type].g, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColors[this->type].r, primColors[this->type].g, primColors[this->type].b, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, envColors[this->type].r, envColors[this->type].g, envColors[this->type].b, + gDPSetEnvColor(POLY_XLU_DISP++, envColors[this->type].r, envColors[this->type].g, envColors[this->type].b, 128); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0601C160); + gSPDisplayList(POLY_XLU_DISP++, D_0601C160); CLOSE_DISPS(gfxCtx, "../z_en_dy_extra.c", 325); } diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 17299f29ca..bb928f7daa 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1,15 +1,60 @@ +/* + * File: z_en_elf.c + * Overlay: ovl_En_Elf + * Description: Fairy + */ + #include "z_en_elf.h" #define FLAGS 0x02000030 #define THIS ((EnElf*)thisx) +#define FAIRY_FLAG_TIMED (1 << 8) +#define FAIRY_FLAG_BIG (1 << 9) + void EnElf_Init(Actor* thisx, GlobalContext* globalCtx); void EnElf_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnElf_Update(Actor* thisx, GlobalContext* globalCtx); void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx); +void func_80A053F0(Actor* thisx, GlobalContext* globalCtx); +void func_80A052F4(Actor* thisx, GlobalContext* globalCtx); +void func_80A05208(Actor* thisx, GlobalContext* globalCtx); +void func_80A05188(Actor* thisx, GlobalContext* globalCtx); +void func_80A05114(Actor* thisx, GlobalContext* globalCtx); +void func_80A05040(Actor* thisx, GlobalContext* globalCtx); + +// Navi +void func_80A03CF8(EnElf* this, GlobalContext* globalCtx); + +// Healing Fairies +void func_80A0329C(EnElf* this, GlobalContext* globalCtx); +void func_80A03610(EnElf* this, GlobalContext* globalCtx); + +// Healing Fairies Revive From Death +void func_80A03990(EnElf* this, GlobalContext* globalCtx); +void func_80A03814(EnElf* this, GlobalContext* globalCtx); + +// Kokiri Fairies +void func_80A0353C(EnElf* this, GlobalContext* globalCtx); + +// Fairy Spawner +void func_80A03604(EnElf* this, GlobalContext* globalCtx); + +// Move(?) functions +void func_80A0214C(EnElf* this, GlobalContext* globalCtx); +void func_80A02AA4(EnElf* this, GlobalContext* globalCtx); +void func_80A02A20(EnElf* this, GlobalContext* globalCtx); +void func_80A02B38(EnElf* this, GlobalContext* globalCtx); +void func_80A020A4(EnElf* this, GlobalContext* globalCtx); +void func_80A01FE0(EnElf* this, GlobalContext* globalCtx); + +// misc +void func_80A04414(EnElf* this, GlobalContext* globalCtx); +void func_80A0461C(EnElf* this, GlobalContext* globalCtx); +void EnElf_SpawnSparkles(EnElf* this, GlobalContext* globalCtx, s32 sparkleLife); +void EnElf_GetCutsceneNextPos(Vec3f* vec, GlobalContext* globalCtx, s32 action); -/* const ActorInit En_Elf_InitVars = { ACTOR_EN_ELF, ACTORTYPE_ITEMACTION, @@ -21,99 +66,1504 @@ const ActorInit En_Elf_InitVars = { (ActorFunc)EnElf_Update, (ActorFunc)EnElf_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 8, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s") +static Color_RGBAf sInnerColors[] = { + { 255.0f, 255.0f, 255.0f, 255.0f }, + { 255.0f, 220.0f, 220.0f, 255.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s") +static Color_RGBAf sOuterColors[] = { + { 255.0f, 255.0f, 255.0f, 255.0f }, + { 255.0f, 50.0f, 100.0f, 255.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s") +typedef struct { + u8 r, g, b; +} FairyColorFlags; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s") +static FairyColorFlags sColorFlags[] = { + { 0, 0, 0 }, { 1, 0, 0 }, { 1, 2, 0 }, { 1, 0, 2 }, { 0, 1, 0 }, { 2, 1, 0 }, { 0, 1, 2 }, + { 0, 0, 1 }, { 2, 0, 1 }, { 0, 2, 1 }, { 1, 1, 0 }, { 1, 0, 1 }, { 0, 1, 1 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s") +extern SkeletonHeader D_04016A48; +extern AnimationHeader D_04014BA4; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s") +void EnElf_SetupAction(EnElf* this, EnElfActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s") +void func_80A01C38(EnElf* this, s32 arg1) { + this->unk_2A8 = arg1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s") + switch (this->unk_2A8) { + case 0: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2C0 = 100; + this->unk_2B4 = 5.0f; + this->unk_2B8 = 20.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 12: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2C0 = 100; + this->unk_2B4 = 1.0f; + this->unk_2B8 = 5.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 10: + this->unk_2AE = 0x400; + this->unk_2B0 = 0; + this->func_2C8 = func_80A02A20; + this->unk_2B8 = 0.0f; + this->unk_2B4 = 5.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 9: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 3.0f; + this->unk_2B8 = 10.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 7: + this->func_2C8 = func_80A02A20; + this->unk_2AE = 0x1E; + this->unk_2C0 = 1; + this->unk_2B4 = 0.0f; + this->unk_2B8 = 0.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 8: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 0.0f; + this->unk_2B8 = 0.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 1: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x800; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 5.0f; + this->unk_2B8 = 7.5f; + this->skelAnime.animPlaybackSpeed = 2.0f; + break; + case 2: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x1000; + this->func_2C8 = func_80A02AA4; + this->unk_2B4 = 10.0f; + this->unk_2B8 = 20.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 3: + this->unk_2B0 = 0x600; + this->func_2C8 = func_80A02B38; + this->unk_2B8 = 1.0f; + this->unk_2B4 = 1.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 4: + this->unk_2B0 = 0x800; + this->func_2C8 = func_80A02B38; + this->unk_2B4 = 20.0f; + this->unk_2B8 = 10.0; + this->skelAnime.animPlaybackSpeed = 2.0f; + break; + case 5: + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02B38; + this->unk_2B4 = 10.0f; + this->unk_2B8 = 10.0f; + this->skelAnime.animPlaybackSpeed = 0.5f; + break; + case 6: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x800; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 60.0f; + this->unk_2B8 = 20.0f; + this->skelAnime.animPlaybackSpeed = 2.0f; + break; + case 11: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x2000; + this->func_2C8 = func_80A02A20; + this->unk_2C0 = 42; + this->unk_2B4 = 5.0f; + this->unk_2B8 = 1.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s") +s32 func_80A01F90(Vec3f* this, Vec3f* arg1, f32 arg2) { + return SQ(arg2) < (SQ(arg1->x - this->x) + SQ(arg1->z - this->z)); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s") +void func_80A01FE0(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s") + if (!func_80A01F90(&this->actor.posRot.pos, &player->actor.posRot.pos, 30.0f)) { + this->unk_2B8 = 0.5f; + } else { + this->unk_2B8 = 2.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s") + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + this->unk_2A8 = 1; + this->unk_2AC = 0x80; + this->unk_2B8 = Math_Rand_ZeroFloat(1.0f) + 0.5f; + this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + this->func_2C8 = func_80A0214C; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s") +void func_80A020A4(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s") + if (func_80A01F90(&this->actor.posRot.pos, &player->actor.posRot.pos, 50.0f)) { + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + this->unk_2A8 = 1; + this->unk_2AC = 0x80; + this->unk_2B8 = Math_Rand_ZeroFloat(1.0f) + 0.5f; + this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + this->func_2C8 = func_80A0214C; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s") +void func_80A0214C(EnElf* this, GlobalContext* globalCtx) { + f32 xzDistFromLink; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s") + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + xzDistFromLink = this->actor.xzDistFromLink; + if (xzDistFromLink < 50.0f) { + if (Math_Rand_ZeroOne() < 0.2f) { + this->unk_2A8 = 2; + this->unk_2AC = 0x400; + this->unk_2B8 = 2.0f; + this->func_2C8 = func_80A020A4; + this->actor.speedXZ = 1.5f; + this->unk_2C0 = (s16)Math_Rand_ZeroFloat(8.0f) + 4; + } else { + this->unk_2C0 = 10; + } + } else { + if (xzDistFromLink > 150.0f) { + xzDistFromLink = 150.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s") + xzDistFromLink = ((xzDistFromLink - 50.0f) * 0.95f) + 0.05f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s") + if (Math_Rand_ZeroOne() < xzDistFromLink) { + this->unk_2A8 = 3; + this->unk_2AC = 0x200; + this->unk_2B8 = (xzDistFromLink * 2.0f) + 1.0f; + this->func_2C8 = func_80A01FE0; + this->unk_2C0 = (s16)Math_Rand_ZeroFloat(16.0f) + 0x10; + } else { + this->unk_2C0 = 10; + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s") + if (Math_Rand_ZeroOne() < 0.1f) { + this->unk_2A8 = 1; + this->unk_2AC = 0x80; + this->unk_2B8 = Math_Rand_ZeroFloat(0.5f) + 0.5f; + this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + } +} +void func_80A0232C(EnElf* this, GlobalContext* globalCtx) { + if (func_80A01F90(&this->unk_28C, &this->actor.posRot.pos, 100.0f)) { + this->unk_2A8 = 0; + this->unk_2AC = 0x200; + this->func_2C8 = func_80A0214C; + this->unk_2B8 = 1.5f; + } else { + this->func_2C8(this, globalCtx); + } +} + +f32 EnElf_GetColorValue(s32 colorFlag) { + switch (colorFlag) { + case 1: + return Math_Rand_ZeroFloat(55.0f) + 200.0f; + case 2: + return Math_Rand_ZeroFloat(255.0f); + default: + return 0.0f; + } +} + +void EnElf_Init(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + s32 pad; + Player* player = PLAYER; + s32 colorConfig; + s32 i; + + Actor_ProcessInitChain(thisx, sInitChain); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_04016A48, &D_04014BA4, this->limbDrawTable, + this->transitionDrawTable, 15); + ActorShape_Init(&thisx->shape, 0.0f, NULL, 15.0f); + thisx->shape.unk_14 = 0xFF; + + Lights_PointGlowSetInfo(&this->lightInfoGlow, thisx->posRot.pos.x, thisx->posRot.pos.y, thisx->posRot.pos.z, 255, + 255, 255, 0); + this->lightNodeGlow = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfoGlow); + + Lights_PointNoGlowSetInfo(&this->lightInfoNoGlow, thisx->posRot.pos.x, thisx->posRot.pos.y, thisx->posRot.pos.z, + 255, 255, 255, 0); + this->lightNodeNoGlow = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfoNoGlow); + + this->fairyFlags = 0; + this->disappearTimer = 600; + this->unk_2A4 = 0.0f; + colorConfig = 0; + + switch (thisx->params) { + case FAIRY_NAVI: + thisx->room = -1; + EnElf_SetupAction(this, func_80A03CF8); + func_80A01C38(this, 0); + this->fairyFlags |= 4; + thisx->update = func_80A053F0; + this->elfMsg = NULL; + this->unk_2C7 = 0x14; + + if ((gSaveContext.naviTimer >= 25800) || (gSaveContext.naviTimer < 3000)) { + gSaveContext.naviTimer = 0; + } + break; + case FAIRY_REVIVE_BOTTLE: + colorConfig = -1; + EnElf_SetupAction(this, func_80A03610); + this->unk_2B8 = Math_Vec3f_DistXZ(&thisx->posRot.pos, &player->actor.posRot.pos); + this->unk_2AC = player->actor.shape.rot.y; + this->unk_2B0 = -0x1000; + this->unk_28C.y = thisx->posRot.pos.y - player->actor.posRot.pos.y; + this->unk_2AA = 0; + this->unk_2B4 = 0.0f; + break; + case FAIRY_REVIVE_DEATH: + colorConfig = -1; + EnElf_SetupAction(this, func_80A03990); + this->unk_2B8 = 0.0f; + this->unk_2AC = player->actor.shape.rot.y; + this->unk_2B0 = 0; + this->unk_28C.y = thisx->posRot.pos.y - player->actor.posRot.pos.y; + this->unk_2AA = 0; + this->unk_2B4 = 7.0f; + break; + case FAIRY_HEAL_BIG: + this->fairyFlags |= FAIRY_FLAG_BIG; + thisx->shape.shadowDrawFunc = ActorShadow_DrawFunc_WhiteCircle; + case FAIRY_HEAL_TIMED: + this->fairyFlags |= FAIRY_FLAG_TIMED; + case FAIRY_HEAL: + colorConfig = -1; + EnElf_SetupAction(this, func_80A0329C); + this->unk_2B4 = Math_Rand_ZeroFloat(10.0f) + 10.0f; + this->unk_2AA = 0; + this->unk_2AE = (s16)(Math_Rand_ZeroFloat(1048.0f)) + 0x200; + this->unk_28C = thisx->posRot.pos; + this->unk_2BC = Math_Rand_CenteredFloat(32767.0f); + this->func_2C8 = func_80A0214C; + func_80A0232C(this, globalCtx); + this->unk_2C0 = 0; + this->disappearTimer = 240; + break; + case FAIRY_KOKIRI: + colorConfig = Math_Rand_ZeroFloat(11.99f) + 1.0f; + EnElf_SetupAction(this, func_80A0353C); + func_80A01C38(this, 0); + break; + case FAIRY_SPAWNER: + EnElf_SetupAction(this, func_80A03604); + func_80A01C38(this, 8); + + for (i = 0; i < 8; i++) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, thisx->posRot.pos.x, + thisx->posRot.pos.y - 30.0f, thisx->posRot.pos.z, 0, 0, 0, FAIRY_HEAL); + } + break; + default: + __assert("0", "../z_en_elf.c", 1103); + break; + } + + this->unk_2A0 = 3.0f; + this->innerColor = sInnerColors[0]; + + if (colorConfig > 0) { + this->outerColor.r = EnElf_GetColorValue(sColorFlags[colorConfig].r); + this->outerColor.g = EnElf_GetColorValue(sColorFlags[colorConfig].g); + this->outerColor.b = EnElf_GetColorValue(sColorFlags[colorConfig].b); + this->outerColor.a = 0.0f; + } else { + this->innerColor = sInnerColors[-colorConfig]; + this->outerColor = sOuterColors[-colorConfig]; + } +} + +void func_80A0299C(EnElf* this, s32 arg1) { +} + +void func_80A029A8(EnElf* this, s16 increment) { + if (this->disappearTimer < 600) { + this->disappearTimer += increment; + } +} + +void EnElf_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnElf* this = THIS; + + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNodeGlow); + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNodeNoGlow); +} + +void func_80A02A20(EnElf* this, GlobalContext* globalCtx) { + this->unk_28C.x = Math_Sins(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = Math_Sins(this->unk_2AA) * this->unk_2B4; + this->unk_28C.z = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_2AC += this->unk_2B0; + this->unk_2AA += this->unk_2AE; +} + +void func_80A02AA4(EnElf* this, GlobalContext* globalCtx) { + f32 xzScale; + + xzScale = (Math_Coss(this->unk_2AA) * this->unk_2B4) + this->unk_2B8; + + this->unk_28C.x = Math_Sins(this->unk_2AC) * xzScale; + this->unk_28C.y = 0.0f; + this->unk_28C.z = Math_Coss(this->unk_2AC) * xzScale; + + this->unk_2AC += this->unk_2B0; + this->unk_2AA += this->unk_2AE; +} + +void func_80A02B38(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->unk_2AA = (this->unk_2AC * 2) & 0xFFFF; + this->unk_28C.x = Math_Sins(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = Math_Sins(this->unk_2AA) * this->unk_2B4; + this->unk_28C.z = -Math_Sins(player->actor.shape.rot.y) * this->unk_28C.x; + this->unk_28C.x = Math_Coss(player->actor.shape.rot.y) * this->unk_28C.x; + this->unk_2AC += this->unk_2B0; +} + +void func_80A02BD8(EnElf* this, Vec3f* targetPos, f32 arg2) { + f32 yVelTarget; + f32 yVelDirection; + + yVelTarget = ((targetPos->y + this->unk_28C.y) - this->actor.posRot.pos.y) * arg2; + yVelDirection = (yVelTarget >= 0.0f) ? 1.0f : -1.0f; + yVelTarget = fabsf(yVelTarget); + yVelTarget = CLAMP(yVelTarget, 0.0f, 20.0f) * yVelDirection; + Math_ApproxF(&this->actor.velocity.y, yVelTarget, 32.0f); +} + +void func_80A02C98(EnElf* this, Vec3f* targetPos, f32 arg2) { + f32 xVelTarget; + f32 zVelTarget; + f32 xVelDirection; + f32 zVelDirection; + + xVelTarget = ((targetPos->x + this->unk_28C.x) - this->actor.posRot.pos.x) * arg2; + zVelTarget = ((targetPos->z + this->unk_28C.z) - this->actor.posRot.pos.z) * arg2; + + xVelDirection = (xVelTarget >= 0.0f) ? 1.0f : -1.0f; + zVelDirection = (zVelTarget >= 0.0f) ? 1.0f : -1.0f; + + xVelTarget = fabsf(xVelTarget); + zVelTarget = fabsf(zVelTarget); + + xVelTarget = CLAMP(xVelTarget, 0.0f, 20.0f) * xVelDirection; + zVelTarget = CLAMP(zVelTarget, 0.0f, 20.0f) * zVelDirection; + + func_80A02BD8(this, targetPos, arg2); + Math_ApproxF(&this->actor.velocity.x, xVelTarget, 1.5f); + Math_ApproxF(&this->actor.velocity.z, zVelTarget, 1.5f); + func_8002D7EC(&this->actor); +} + +void func_80A02E30(EnElf* this, Vec3f* targetPos) { + func_80A02BD8(this, targetPos, 0.2f); + this->actor.velocity.x = (targetPos->x + this->unk_28C.x) - this->actor.posRot.pos.x; + this->actor.velocity.z = (targetPos->z + this->unk_28C.z) - this->actor.posRot.pos.z; + func_8002D7EC(&this->actor); + this->actor.posRot.pos.x = targetPos->x + this->unk_28C.x; + this->actor.posRot.pos.z = targetPos->z + this->unk_28C.z; +} + +void func_80A02EC0(EnElf* this, Vec3f* targetPos) { + func_80A02BD8(this, targetPos, 0.2f); + this->actor.velocity.x = this->actor.velocity.z = 0.0f; + func_8002D7EC(&this->actor); + this->actor.posRot.pos.x = targetPos->x + this->unk_28C.x; + this->actor.posRot.pos.z = targetPos->z + this->unk_28C.z; +} + +void func_80A02F2C(EnElf* this, Vec3f* targetPos) { + f32 yVelTarget; + f32 yVelDirection; + + yVelTarget = (((Math_Sins(this->unk_2AA) * this->unk_2B4) + targetPos->y) - this->actor.posRot.pos.y) * 0.2f; + yVelDirection = (yVelTarget >= 0.0f) ? 1.0f : -1.0f; + this->unk_2AA += this->unk_2AE; + yVelTarget = fabsf(yVelTarget); + yVelTarget = CLAMP(yVelTarget, 0.0f, 20.0f) * yVelDirection; + Math_ApproxF(&this->actor.velocity.y, yVelTarget, 1.5f); +} + +void func_80A03018(EnElf* this, GlobalContext* globalCtx) { + s32 pad[2]; + Player* player = PLAYER; + s16 targetYaw; + Vec3f* unk_28C = &this->unk_28C; + + Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->unk_2B8, 0.2f, 0.5f, 0.01f); + + switch (this->unk_2A8) { + case 0: + targetYaw = atan2s(-(this->actor.posRot.pos.z - unk_28C->z), -(this->actor.posRot.pos.x - unk_28C->x)); + break; + + case 3: + targetYaw = atan2s(-(this->actor.posRot.pos.z - player->actor.posRot.pos.z), + -(this->actor.posRot.pos.x - player->actor.posRot.pos.x)); + break; + + case 2: + targetYaw = atan2s(this->actor.posRot.pos.z - player->actor.posRot.pos.z, + this->actor.posRot.pos.x - player->actor.posRot.pos.x); + break; + + default: + targetYaw = this->unk_2B0; + break; + } + + Math_SmoothScaleMaxMinS(&this->unk_2BC, targetYaw, 10, this->unk_2AC, 0x20); + this->actor.posRot.rot.y = this->unk_2BC; + Actor_MoveForward(&this->actor); +} + +#ifdef NON_MATCHING +// slight ordering and regalloc +void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) { + f32 xVelTarget; + f32 zVelTarget; + f32 xzVelocity; + f32 clampedXZ; + + xVelTarget = ((arg1->x + this->unk_28C.x) - this->actor.posRot.pos.x) * arg4; + zVelTarget = ((arg1->z + this->unk_28C.z) - this->actor.posRot.pos.z) * arg4; + arg3 += 30.0f; + + func_80A02BD8(this, arg1, arg4 + 0.3f); + + xzVelocity = sqrtf(SQ(xVelTarget) + SQ(zVelTarget)); + clampedXZ = CLAMP(xzVelocity, arg2, arg3); + this->actor.speedXZ = clampedXZ; + + if ((xzVelocity != clampedXZ) && (xzVelocity != 0.0f)) { + zVelTarget *= (clampedXZ / xzVelocity); + xVelTarget *= (clampedXZ / xzVelocity); + } + + Math_ApproxF(&this->actor.velocity.x, xVelTarget, 5.0f); + Math_ApproxF(&this->actor.velocity.z, zVelTarget, 5.0f); + func_8002D7EC(this); +} +#else +void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03148.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s") +void func_80A0329C(EnElf* this, GlobalContext* globalCtx) { + Player* refActor = PLAYER; + s32 pad; + Player* player = PLAYER; + f32 heightDiff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s") + if (Math_Rand_ZeroOne() < 0.05f) { + this->unk_2B4 = Math_Rand_ZeroFloat(10.0f) + 10.0f; + this->unk_2AE = (s16)(Math_Rand_ZeroFloat(1024.0f)) + 0x200; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s") + func_80A0232C(this, globalCtx); + this->unk_28C.y = player->bodyPartsPos[0].y; + func_80A02F2C(this, &this->unk_28C); + func_80A03018(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s") + if ((this->unk_2A8 == 2) || (this->unk_2A8 == 3)) { + EnElf_SpawnSparkles(this, globalCtx, 16); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s") + if (Actor_HasParent(&this->actor, globalCtx)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s") + if (!Player_InCsMode(globalCtx)) { + heightDiff = this->actor.posRot.pos.y - refActor->actor.posRot.pos.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s") + if ((heightDiff > 0.0f) && (heightDiff < 60.0f)) { + if (!func_80A01F90(&this->actor.posRot.pos, &refActor->actor.posRot.pos, 10.0f)) { + Health_ChangeBy(globalCtx, 128); + if (this->fairyFlags & FAIRY_FLAG_BIG) { + Magic_Fill(globalCtx); + } + this->unk_2B8 = 50.0f; + this->unk_2AC = refActor->actor.shape.rot.y; + this->unk_2B0 = -0x1000; + this->unk_28C.y = 30.0f; + this->unk_2B4 = 0.0f; + this->unk_2AA = 0; + EnElf_SetupAction(this, func_80A03610); + return; + } + } + if (this->fairyFlags & FAIRY_FLAG_TIMED) { + if (this->disappearTimer > 0) { + this->disappearTimer--; + } else { + this->disappearTimer--; + + if (this->disappearTimer > -10) { + Actor_SetScale(&this->actor, ((this->disappearTimer + 10) * 0.008f) * 0.1f); + } else { + Actor_Kill(&this->actor); + return; + } + } + } + + if (!(this->fairyFlags & FAIRY_FLAG_BIG)) { + func_8002F434(&this->actor, globalCtx, GI_MAX, 80.0f, 60.0f); + } + } +} + +void func_80A0353C(EnElf* this, GlobalContext* globalCtx) { + Vec3f parentPos; + Actor* parent; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + func_80A02A20(this, globalCtx); + parent = this->actor.parent; + + if ((parent != NULL) && (parent->update != NULL)) { + parentPos = this->actor.parent->posRot.pos; + parentPos.y += ((1500.0f * this->actor.scale.y) + 40.0f); + func_80A02C98(this, &parentPos, 0.2f); + } else { + Actor_Kill(&this->actor); + } + + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); +} + +void func_80A03604(EnElf* this, GlobalContext* globalCtx) { +} + +void func_80A03610(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_SmoothScaleMaxMinF(&this->unk_2B8, 30.0f, 0.1f, 4.0f, 1.0f); + + this->unk_28C.x = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = this->unk_28C.y + this->unk_2B4; + + switch (this->unk_2AA) { + case 0: + if (this->unk_2B4 < 2.0f) { + this->unk_2B4 += 0.1f; + } else { + this->unk_2AA++; + } + break; + case 1: + if (this->unk_2B4 > -1.0f) { + this->unk_2B4 -= 0.2f; + } + } + + this->unk_28C.z = Math_Sins(this->unk_2AC) * -this->unk_2B8; + this->unk_2AC += this->unk_2B0; + func_80A02C98(this, &player->actor.posRot.pos, 0.2f); + + if (this->unk_2B4 < 0.0f) { + if ((this->unk_28C.y < 20.0f) && (this->unk_28C.y > 0.0f)) { + Actor_SetScale(&this->actor, (this->unk_28C.y * 0.008f) * 0.05f); + } + } + + if (this->unk_28C.y < -10.0f) { + Actor_Kill(&this->actor); + return; + } + + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + EnElf_SpawnSparkles(this, globalCtx, 32); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); +} + +void func_80A03814(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (this->unk_28C.y > 200.0f) { + Actor_Kill(&this->actor); + return; + } + + if (this->unk_2AE >= 0x7E) { + this->unk_2B8 += 0.1f; + this->unk_2B4 += 0.5f; + this->unk_28C.y += this->unk_2B4; + } else { + this->unk_2AE++; + + if (this->unk_2B8 < 30.0f) { + this->unk_2B8 += 0.5f; + } + + if (this->unk_28C.y > 0.0f) { + this->unk_28C.y -= 0.7f; + } + } + + this->unk_28C.x = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_28C.z = Math_Sins(this->unk_2AC) * -this->unk_2B8; + this->unk_2AC += this->unk_2B0; + func_80A02E30(this, &player->bodyPartsPos[0]); + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + EnElf_SpawnSparkles(this, globalCtx, 32); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); +} + +void func_80A03990(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + this->unk_28C.z = 0.0f; + this->unk_28C.x = 0.0f; + this->unk_28C.y += this->unk_2B4; + this->unk_2B4 -= 0.35f; + + if (this->unk_2B4 <= 0.0f) { + EnElf_SetupAction(this, func_80A03814); + this->unk_2B0 = 0x800; + this->unk_2AE = 0; + this->unk_2B4 = 0.0f; + this->unk_2B8 = 1.0f; + } + + func_80A02E30(this, &player->bodyPartsPos[0]); + Actor_SetScale(&this->actor, (1.0f - (SQ(this->unk_2B4) * 0.012345679f)) * 0.008f); + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + EnElf_SpawnSparkles(this, globalCtx, 32); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); +} + +void func_80A03AB0(EnElf* this, GlobalContext* globalCtx) { + if (this->fairyFlags & 4) { + func_80A04414(this, globalCtx); + } + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (this->func_2C8 == NULL) { + __assert("0", "../z_en_elf.c", 1725); + } + + this->func_2C8(this, globalCtx); +} + +void EnElf_UpdateLights(EnElf* this, GlobalContext* globalCtx) { + s16 glowLightRadius; + Player* player; + + glowLightRadius = 100; + + if (this->unk_2A8 == 8) { + glowLightRadius = 0; + } + + if (this->fairyFlags & 0x20) { + player = PLAYER; + Lights_PointNoGlowSetInfo(&this->lightInfoNoGlow, player->actor.posRot.pos.x, + (s16)(player->actor.posRot.pos.y) + 60.0f, player->actor.posRot.pos.z, 255, 255, 255, + 200); + } else { + Lights_PointNoGlowSetInfo(&this->lightInfoNoGlow, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 255, 255, 255, -1); + } + + Lights_PointGlowSetInfo(&this->lightInfoGlow, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 255, 255, 255, glowLightRadius); + + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + + Actor_SetScale(&this->actor, this->actor.scale.x); +} + +#ifdef NON_MATCHING +// float regalloc +void func_80A03CF8(EnElf* this, GlobalContext* globalCtx) { + Vec3f nextPos; + Vec3f prevPos; + Player* player = PLAYER; + Actor* arrowPointedActor; + f32 xScale; + f32 distFromLinksHead; + + func_80A0461C(this, globalCtx); + func_80A03AB0(this, globalCtx); + + xScale = 0.0f; + + if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[8] != NULL)) { + EnElf_GetCutsceneNextPos(&nextPos, globalCtx, 8); + + if (globalCtx->csCtx.npcActions[8]->action == 5) { + if (1) {} + EnElf_SpawnSparkles(this, globalCtx, 16); + } + + prevPos = this->actor.posRot.pos; + + if (this->unk_2A8 == 0xA) { + func_80A02EC0(this, &nextPos); + } else { + func_80A02C98(this, &nextPos, 0.2f); + } + + if ((globalCtx->sceneNum == SCENE_LINK_HOME) && (gSaveContext.sceneSetupIndex == 4)) { + // play dash sound as Navi enters Links house in the intro + if (1) {} + if (globalCtx->csCtx.frames == 55) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + + // play dash sound in intervals as Navi is waking up Link in the intro + if (this->unk_2A8 == 6) { + if (this->fairyFlags & 0x40) { + if (prevPos.y < this->actor.posRot.pos.y) { + this->fairyFlags &= ~0x40; + } + } else { + if (this->actor.posRot.pos.y < prevPos.y) { + this->fairyFlags |= 0x40; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + } + } + } + } else { + distFromLinksHead = Math_Vec3f_DistXYZ(&player->bodyPartsPos[8], &this->actor.posRot.pos); + + switch (this->unk_2A8) { + case 7: + func_80A02C98(this, &player->bodyPartsPos[8], 1.0f - this->unk_2AE * 0.033333335f); + xScale = + 1.0f - ((Math_Vec3f_DistXYZ(&player->bodyPartsPos[8], &this->actor.posRot.pos) - 5.0f) * 0.05f); + + if (distFromLinksHead < 7.0f) { + this->unk_2C0 = 0; + xScale = 0.0f; + } else if (distFromLinksHead < 25.0f) { + xScale = (1.0f - SQ(xScale)) * 0.008f; + } else { + xScale = 0.008f; + } + EnElf_SpawnSparkles(this, globalCtx, 16); + break; + case 8: + func_80A02C98(this, &player->bodyPartsPos[8], 0.2f); + this->actor.posRot.pos = player->bodyPartsPos[8]; + func_80A029A8(this, 1); + break; + case 11: + nextPos = player->bodyPartsPos[8]; + nextPos.y += this->actor.scale.y * 1500.0f; + func_80A02E30(this, &nextPos); + EnElf_SpawnSparkles(this, globalCtx, 16); + + if (this->unk_2B8 <= 19.0f) { + this->unk_2B8 += 1.0f; + } + + if (this->unk_2B8 >= 21.0f) { + this->unk_2B8 -= 1.0f; + } + + if (this->unk_2C0 < 0x20) { + this->unk_2B0 = (this->unk_2C0 * 0xF0) + 0x200; + func_80A0299C(this, 1); + } + break; + case 12: + nextPos = ACTIVE_CAM->eye; + nextPos.y += (-2000.0f * this->actor.scale.y); + func_80A03148(this, &nextPos, 0.0f, 20.0f, 0.2f); + break; + default: + func_80A029A8(this, 1); + nextPos = globalCtx->actorCtx.targetCtx.naviRefPos; + nextPos.y += (1500.0f * this->actor.scale.y); + arrowPointedActor = globalCtx->actorCtx.targetCtx.arrowPointedActor; + + if (arrowPointedActor != NULL) { + func_80A03148(this, &nextPos, 0.0f, 20.0f, 0.2f); + + if (this->actor.speedXZ >= 5.0f) { + EnElf_SpawnSparkles(this, globalCtx, 16); + } + } else { + if ((this->timer % 32) == 0) { + this->unk_2A0 = Math_Rand_ZeroFloat(7.0f) + 3.0f; + } + + if (this->fairyFlags & 2) { + if (distFromLinksHead < 30.0f) { + this->fairyFlags ^= 2; + } + + func_80A03148(this, &nextPos, 0.0f, 20.0f, 0.2f); + EnElf_SpawnSparkles(this, globalCtx, 16); + } else { + if (distFromLinksHead > 100.0f) { + this->fairyFlags |= 2; + + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + + this->unk_2C0 = 0x64; + } + func_80A03148(this, &nextPos, 0.0f, this->unk_2A0, 0.2f); + } + } + break; + } + } + + if (this->unk_2A8 == 7) { + this->actor.scale.x = xScale; + } else if (this->unk_2A8 == 8) { + this->actor.scale.x = 0.0f; + } else { + Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); + } + + EnElf_UpdateLights(this, globalCtx); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s") +void EnElf_ChangeColor(Color_RGBAf* dest, Color_RGBAf* newColor, Color_RGBAf* curColor, f32 rate) { + Color_RGBAf rgbaDiff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s") + rgbaDiff.r = (newColor->r - curColor->r); + rgbaDiff.g = (newColor->g - curColor->g); + rgbaDiff.b = (newColor->b - curColor->b); + rgbaDiff.a = (newColor->a - curColor->a); + dest->r += (rgbaDiff.r * rate); + dest->g += (rgbaDiff.g * rate); + dest->b += (rgbaDiff.b * rate); + dest->a += (rgbaDiff.a * rate); +} + +void func_80A04414(EnElf* this, GlobalContext* globalCtx) { + Actor* arrowPointedActor = globalCtx->actorCtx.targetCtx.arrowPointedActor; + Player* player = PLAYER; + f32 transitionRate; + u16 targetSound; + + if (globalCtx->actorCtx.targetCtx.unk_40 != 0.0f) { + this->unk_2C6 = 0; + this->unk_29C = 1.0f; + + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + + } else { + if (this->unk_2C6 == 0) { + if ((arrowPointedActor == NULL) || + (Math_Vec3f_DistXYZ(&this->actor.posRot.pos, &globalCtx->actorCtx.targetCtx.naviRefPos) < 50.0f)) { + this->unk_2C6 = 1; + } + } else if (this->unk_29C != 0.0f) { + if (Math_ApproxF(&this->unk_29C, 0.0f, 0.25f) != 0) { + this->innerColor = globalCtx->actorCtx.targetCtx.naviInner; + this->outerColor = globalCtx->actorCtx.targetCtx.naviOuter; + } else { + transitionRate = 0.25f / this->unk_29C; + EnElf_ChangeColor(&this->innerColor, &globalCtx->actorCtx.targetCtx.naviInner, &this->innerColor, + transitionRate); + EnElf_ChangeColor(&this->outerColor, &globalCtx->actorCtx.targetCtx.naviOuter, &this->outerColor, + transitionRate); + } + } + } + + if (this->fairyFlags & 1) { + if ((arrowPointedActor == NULL) || (player->unk_664 == NULL)) { + this->fairyFlags ^= 1; + } + } else { + if ((arrowPointedActor != NULL) && (player->unk_664 != NULL)) { + if (arrowPointedActor->type == ACTORTYPE_NPC) { + targetSound = NA_SE_VO_NAVY_HELLO; + } else { + targetSound = (arrowPointedActor->type == ACTORTYPE_ENEMY) ? NA_SE_VO_NAVY_ENEMY : NA_SE_VO_NAVY_HEAR; + } + + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, targetSound); + } + + this->fairyFlags |= 1; + } + } +} + +#ifdef NON_MATCHING +// useless branch near case 11/default in the switch for this->unk_2A8 +void func_80A0461C(EnElf* this, GlobalContext* globalCtx) { + s32 temp; + Actor* arrowPointedActor; + Player* player = PLAYER; + + if (globalCtx->csCtx.state != 0) { + if (globalCtx->csCtx.npcActions[8] != NULL) { + switch (globalCtx->csCtx.npcActions[8]->action) { + case 4: + temp = 9; + break; + case 3: + temp = 6; + break; + case 1: + temp = 10; + break; + default: + temp = 0; + break; + } + } else { + temp = 0; + this->unk_2C0 = 100; + } + + } else { + arrowPointedActor = globalCtx->actorCtx.targetCtx.arrowPointedActor; + + if ((player->stateFlags1 & 0x400) || ((YREG(15) & 0x10) && func_800BC56C(globalCtx, 2))) { + temp = 12; + this->unk_2C0 = 100; + } else { + if ((arrowPointedActor == NULL) || (temp = 1, (arrowPointedActor->type == ACTORTYPE_NPC))) { + if (arrowPointedActor != NULL) { + this->unk_2C0 = 100; + player->stateFlags2 |= 0x100000; + temp = 0; + } else { + switch (this->unk_2A8) { + case 0: + if (this->unk_2C0 != 0) { + this->unk_2C0--; + temp = 0; + } else { + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_NAVY_VANISH); + } + temp = 7; + } + break; + case 7: + if (this->unk_2C0 != 0) { + if (this->unk_2AE > 0) { + this->unk_2AE--; + temp = 7; + } else { + player->stateFlags2 |= 0x100000; + temp = 0; + } + } else { + temp = 8; + func_80A029A8(this, 10); + } + break; + case 8: + temp = 8; + break; + case 11: + temp = this->unk_2A8; + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + temp = 0; + } + break; + default: + temp = 0; + break; + } + } + } + } + + switch (temp) { + case 0: + if (!(player->stateFlags2 & 0x100000)) { + temp = 7; + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_NAVY_VANISH); + } + } + break; + case 8: + if (player->stateFlags2 & 0x100000) { + func_80A0299C(this, 0x32); + this->unk_2C0 = 42; + temp = 11; + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + } + break; + case 7: + player->stateFlags2 &= ~0x100000; + break; + default: + player->stateFlags2 |= 0x100000; + break; + } + } + + if (temp != this->unk_2A8) { + func_80A01C38(this, temp); + + if (temp == 11) { + this->unk_2B8 = Math_Vec3f_DistXZ(&player->bodyPartsPos[8], &this->actor.posRot.pos); + this->unk_2AC = Math_Vec3f_Yaw(&this->actor.posRot.pos, &player->bodyPartsPos[8]); + } + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s") +void EnElf_SpawnSparkles(EnElf* this, GlobalContext* globalCtx, s32 sparkleLife) { + static Vec3f sparkleVelocity = { 0.0f, -0.05f, 0.0f }; + static Vec3f sparkleAccel = { 0.0f, -0.025f, 0.0f }; + s32 pad; + Vec3f sparklePos; + Color_RGBA8 primColor; + Color_RGBA8 envColor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s") + sparklePos.x = Math_Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.x; + sparklePos.y = (Math_Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; + sparklePos.z = Math_Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s") + primColor.r = this->innerColor.r; + primColor.g = this->innerColor.g; + primColor.b = this->innerColor.b; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s") + envColor.r = this->outerColor.r; + envColor.g = this->outerColor.g; + envColor.b = this->outerColor.b; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s") + EffectSsKiraKira_SpawnDispersed(globalCtx, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor, + 1000, sparkleLife); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s") +void func_80A04D90(EnElf* this, GlobalContext* globalCtx) { + s32 pad; + s32 bgId; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s") + this->actor.groundY = func_8003CA0C(globalCtx, &globalCtx->colCtx, &this->actor.floorPoly, &bgId, &this->actor, + &this->actor.posRot.pos); + this->actor.shape.unk_14 = 0x32; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s") +// move to talk to player +void func_80A04DE4(EnElf* this, GlobalContext* globalCtx) { + Vec3f posRot2Copy; + Player* player = PLAYER; + Vec3f naviRefPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s") + if (this->fairyFlags & 0x10) { + naviRefPos = globalCtx->actorCtx.targetCtx.naviRefPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s") + if ((player->unk_664 == NULL) || (&player->actor == player->unk_664) || (&this->actor == player->unk_664)) { + naviRefPos.x = player->bodyPartsPos[7].x + (Math_Sins(player->actor.shape.rot.y) * 20.0f); + naviRefPos.y = player->bodyPartsPos[7].y + 5.0f; + naviRefPos.z = player->bodyPartsPos[7].z + (Math_Coss(player->actor.shape.rot.y) * 20.0f); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s") + this->actor.posRot2.pos = naviRefPos; + this->fairyFlags &= ~0x10; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s") + func_80A03AB0(this, globalCtx); + posRot2Copy = this->actor.posRot2.pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s") + func_80A03148(this, &posRot2Copy, 0, 20.0f, 0.2f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s") + if (this->actor.speedXZ >= 5.0f) { + EnElf_SpawnSparkles(this, globalCtx, 16); + } + + Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); + EnElf_UpdateLights(this, globalCtx); +} + +// move after talking to player +void func_80A04F94(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->unk_2BC, 5, 0x1000, 0x400); + this->timer++; + Math_ApproxF(&this->unk_2A4, 1.0f, 0.05f); + func_800773A8(globalCtx, SQ(this->unk_2A4), player->actor.projectedPos.z + 780.0f, 0.2f, 0.5f); +} + +// ask to talk to saria again +void func_80A05040(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + func_8010B720(globalCtx, ElfMessage_GetSariaText(globalCtx)); + this->actor.update = func_80A05114; + break; + case 1: // no + func_80106CCC(globalCtx); + this->actor.update = func_80A053F0; + func_80A01C38(this, 0); + this->fairyFlags &= ~0x20; + break; + } + } + + func_80A04F94(this, globalCtx); +} + +void func_80A05114(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + func_8010B720(globalCtx, 0xE3); + this->actor.update = func_80A05040; + } + + func_80A04F94(this, globalCtx); +} + +void func_80A05188(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + func_8010B720(globalCtx, ElfMessage_GetSariaText(globalCtx)); + this->actor.update = func_80A05114; + } + + func_80A04F94(this, globalCtx); +} + +// ask to talk to navi +void func_80A05208(Actor* thisx, GlobalContext* globalCtx) { + s32 naviCUpText; + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + naviCUpText = ElfMessage_GetCUpText(globalCtx); + + if (naviCUpText != 0) { + func_8010B720(globalCtx, naviCUpText); + } else { + func_8010B720(globalCtx, 0x15F); + } + + this->actor.update = func_80A052F4; + break; + case 1: // no + func_80106CCC(globalCtx); + this->actor.update = func_80A053F0; + func_80A01C38(this, 0); + this->fairyFlags &= ~0x20; + break; + } + } + + func_80A04F94(this, globalCtx); +} + +// ask to talk to saria +void func_80A052F4(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if (func_8010BDBC(&globalCtx->msgCtx) == 4) { + if (func_80106BC8(globalCtx)) { + globalCtx->msgCtx.unk_E3F2 = 0xFF; + + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + this->actor.update = func_80A05188; + func_8010B720(globalCtx, 0xE2); + break; + case 1: // no + this->actor.update = func_80A05208; + func_8010B720(globalCtx, 0xE1); + break; + } + } + } else if (func_8002F334(thisx, globalCtx)) { + this->actor.update = func_80A053F0; + func_80A01C38(this, 0); + this->fairyFlags &= ~0x20; + } + + func_80A04F94(this, globalCtx); +} + +void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) { + u8 unk2C7; + s32 pad; + Player* player = PLAYER; + EnElf* this = THIS; + + if (player->naviTextId == 0) { + if (player->unk_664 == NULL) { + if (((gSaveContext.naviTimer >= 600) && (gSaveContext.naviTimer <= 3000)) || (nREG(89) != 0)) { + player->naviTextId = ElfMessage_GetCUpText(globalCtx); + + if (player->naviTextId == 0x15F) { + player->naviTextId = 0; + } + } + } + } else if (player->naviTextId < 0) { + // trigger dialog instantly for negative message IDs + thisx->flags |= 0x10000; + } + + if (func_8002F194(thisx, globalCtx)) { + func_800F4524(&D_801333D4, NA_SE_VO_SK_LAUGH, 0x20); + thisx->posRot2.pos = thisx->posRot.pos; + + if (thisx->textId == ElfMessage_GetCUpText(globalCtx)) { + this->fairyFlags |= 0x80; + gSaveContext.naviTimer = 3001; + } + + this->fairyFlags |= 0x10; + this->fairyFlags |= 0x20; + thisx->update = func_80A052F4; + func_80A01C38(this, 3); + + if (this->elfMsg != NULL) { + this->elfMsg->actor.flags |= 0x100; + } + + thisx->flags &= ~0x10000; + } else { + this->actionFunc(this, globalCtx); + thisx->shape.rot.y = this->unk_2BC; + nREG(80) = gSaveContext.sceneFlags[127].chest; + + if (nREG(81) != 0) { + if (gSaveContext.sceneFlags[127].chest) { + LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest, + "../z_en_elf.c", 2595); + } + } + + if (!Gameplay_InCsMode(globalCtx)) { + if (gSaveContext.naviTimer < 25800) { + gSaveContext.naviTimer++; + } else if (!(this->fairyFlags & 0x80)) { + gSaveContext.naviTimer = 0; + } + } + } + + this->elfMsg = NULL; + this->timer++; + + if (this->unk_2A4 > 0.0f) { + Math_ApproxF(&this->unk_2A4, 0.0f, 0.05f); + func_800773A8(globalCtx, SQ(this->unk_2A4) * this->unk_2A4, player->actor.projectedPos.z + 780.0f, 0.2f, 0.5f); + } + + // temp probably fake match + unk2C7 = this->unk_2C7; + if (unk2C7 > 0) { + this->unk_2C7--; + } + + if ((this->unk_2C7 == 0) && (globalCtx->csCtx.state != 0)) { + this->unk_2C7 = 1; + } + + func_80A04D90(this, globalCtx); +} + +void EnElf_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnElf* this = THIS; + + this->actionFunc(this, globalCtx); + this->actor.shape.rot.y = this->unk_2BC; + this->timer++; + + if (this->fairyFlags & FAIRY_FLAG_BIG) { + func_80A04D90(this, globalCtx); + } +} + +s32 EnElf_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + struct Actor* thisx, Gfx** gfx) { + static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + s32 pad; + f32 scale; + Vec3f mtxMult; + EnElf* this = THIS; + + if (limbIndex == 8) { + scale = ((Math_Sins(this->timer * 4096) * 0.1f) + 1.0f) * 0.012f; + + if (this->fairyFlags & FAIRY_FLAG_BIG) { + scale *= 2.0f; + } + + scale *= (this->actor.scale.x * 124.99999f); + Matrix_MultVec3f(&zeroVec, &mtxMult); + Matrix_Translate(mtxMult.x, mtxMult.y, mtxMult.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + } + + // do not draw wings for big fairies + if (this->fairyFlags & FAIRY_FLAG_BIG) { + if (limbIndex == 4 || limbIndex == 7 || limbIndex == 11 || limbIndex == 14) { + *dList = NULL; + } + } + + return 0; +} + +void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + f32 alphaScale; + s32 envAlpha; + EnElf* this = THIS; + s32 pad1; + Gfx* dListHead; + Player* player = PLAYER; + + if ((this->unk_2A8 != 8) && !(this->fairyFlags & 8)) { + if (!(player->stateFlags1 & 0x100000) || (kREG(90) < this->actor.projectedPos.z)) { + dListHead = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Gfx) * 4); + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_elf.c", 2730); + + func_80094B58(globalCtx->state.gfxCtx); + + envAlpha = (this->timer * 50) & 0x1FF; + envAlpha = (envAlpha > 255) ? 511 - envAlpha : envAlpha; + + alphaScale = this->disappearTimer < 0 ? (this->disappearTimer * (7.0f / 6000.0f)) + 1.0f : 1.0f; + + gSPSegment(POLY_XLU_DISP++, 0x08, dListHead); + gDPPipeSync(dListHead++); + gDPSetPrimColor(dListHead++, 0, 0x01, (u8)this->innerColor.r, (u8)this->innerColor.g, + (u8)this->innerColor.b, (u8)(this->innerColor.a * alphaScale)); + + if (this->fairyFlags & 4) { + gDPSetRenderMode(dListHead++, G_RM_PASS, G_RM_CLD_SURF2); + } else { + gDPSetRenderMode(dListHead++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + } + + gSPEndDisplayList(dListHead++); + gDPSetEnvColor(POLY_XLU_DISP++, (u8)this->outerColor.r, (u8)this->outerColor.g, (u8)this->outerColor.b, + (u8)(envAlpha * alphaScale)); + POLY_XLU_DISP = SkelAnime_Draw2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnElf_OverrideLimbDraw, NULL, &this->actor, POLY_XLU_DISP); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_elf.c", 2793); + } + } +} + +void EnElf_GetCutsceneNextPos(Vec3f* vec, GlobalContext* globalCtx, s32 action) { + Vec3f startPos; + Vec3f endPos; + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[action]; + f32 lerp; + + startPos.x = npcAction->startPos.x; + startPos.y = npcAction->startPos.y; + startPos.z = npcAction->startPos.z; + + endPos.x = npcAction->endPos.x; + endPos.y = npcAction->endPos.y; + endPos.z = npcAction->endPos.z; + + lerp = func_8006F93C(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames); + + vec->x = ((endPos.x - startPos.x) * lerp) + startPos.x; + vec->y = ((endPos.y - startPos.y) * lerp) + startPos.y; + vec->z = ((endPos.z - startPos.z) * lerp) + startPos.z; +} diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h index bbb73f8b31..3cca53ff25 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -3,16 +3,58 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h" struct EnElf; +typedef void (*EnElfActionFunc)(struct EnElf*, GlobalContext*); +typedef void (*EnElfUnkFunc)(struct EnElf*, GlobalContext*); + typedef struct EnElf { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x14C]; - /* 0x0298 */ Actor* unk_298; - /* 0x029C */ char unk_29C[0x34]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[15]; + /* 0x01EA */ Vec3s transitionDrawTable[15]; + /* 0x0244 */ Color_RGBAf innerColor; + /* 0x0254 */ Color_RGBAf outerColor; + /* 0x0264 */ LightInfo lightInfoGlow; + /* 0x0274 */ LightNode* lightNodeGlow; + /* 0x0278 */ LightInfo lightInfoNoGlow; + /* 0x0288 */ LightNode* lightNodeNoGlow; + /* 0x028C */ Vec3f unk_28C; + /* 0x0298 */ ElfMsg* elfMsg; + /* 0x029C */ f32 unk_29C; + /* 0x02A0 */ f32 unk_2A0; + /* 0x02A4 */ f32 unk_2A4; + /* 0x02A8 */ s16 unk_2A8; + /* 0x02AA */ s16 unk_2AA; + /* 0x02AC */ s16 unk_2AC; + /* 0x02AE */ s16 unk_2AE; + /* 0x02B0 */ s16 unk_2B0; + /* 0x02B4 */ f32 unk_2B4; + /* 0x02B8 */ f32 unk_2B8; + /* 0x02BC */ s16 unk_2BC; + /* 0x02BE */ u16 timer; + /* 0x02C0 */ s16 unk_2C0; + /* 0x02C2 */ s16 disappearTimer; + /* 0x02C4 */ u16 fairyFlags; + /* 0x02C6 */ u8 unk_2C6; + /* 0x02C7 */ u8 unk_2C7; + /* 0x02C8 */ EnElfUnkFunc func_2C8; + /* 0x02CC */ EnElfActionFunc actionFunc; } EnElf; // size = 0x02D0 +typedef enum { + /* 0x00 */ FAIRY_NAVI, + /* 0x01 */ FAIRY_REVIVE_BOTTLE, + /* 0x02 */ FAIRY_HEAL_TIMED, + /* 0x03 */ FAIRY_KOKIRI, + /* 0x04 */ FAIRY_SPAWNER, + /* 0x05 */ FAIRY_REVIVE_DEATH, + /* 0x06 */ FAIRY_HEAL, + /* 0x07 */ FAIRY_HEAL_BIG +} FairyType; + extern const ActorInit En_Elf_InitVars; #endif diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 454a8d76a6..bac7151df8 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -376,10 +376,10 @@ void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(thisx, globalCtx, 0); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 780), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 780), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A0B3B8[this->unk_150])); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_04042440); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A0B3B8[this->unk_150])); + gSPDisplayList(POLY_OPA_DISP++, D_04042440); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 784); } diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 8a259e5209..b21560a13d 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -472,49 +472,49 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { if (thisx->params == 0x24) { func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (s8)this->unk_160); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 165, 255, 75, 0); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1745), + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->unk_160); + gDPSetEnvColor(POLY_XLU_DISP++, 165, 255, 75, 0); + gDPPipeSync(POLY_XLU_DISP++); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1745), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_0600FCF8)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0600FCF8)); } else if ((thisx->params == 0x26) || (thisx->params == 0x32)) { osSyncPrintf("yari hikari draw 1\n"); func_800D1FD4(&globalCtx->mf_11DA0); func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (s8)this->unk_160); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->unk_160); if (this->fireMode > 0) { - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 255, 255, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 0); } else { - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 165, 255, 75, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 165, 255, 75, 0); } - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); Matrix_RotateZ((thisx->shape.rot.z / 32768.0f) * 3.1416f, 1); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1801), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1801), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06012160); + gSPDisplayList(POLY_XLU_DISP++, D_06012160); } else if ((thisx->params == 0x27) || (thisx->params == 0x28) || (thisx->params == 0x29)) { func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, (u8)this->unk_188); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 90, 50, 95, (s8)(this->unk_188 * 0.5f)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1833), + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (u8)this->unk_188); + gDPSetEnvColor(POLY_XLU_DISP++, 90, 50, 95, (s8)(this->unk_188 * 0.5f)); + gDPPipeSync(POLY_XLU_DISP++); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1833), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (s16)this->unk_174, (s16)this->unk_178, 0x40, 0x40, 1, (s16)this->unk_17C, (s16)this->unk_180, 0x40, 0x40)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0600FAA0); + gSPDisplayList(POLY_XLU_DISP++, D_0600FAA0); } else { osSyncPrintf("FF DRAW 1\n"); Matrix_Translate(0.0f, -100.0f, 0.0f, 1); func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (s8)this->unk_160); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 255, 30, 0); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1892), + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->unk_160); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 30, 0); + gDPPipeSync(POLY_XLU_DISP++); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1892), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_060105E0); + gSPDisplayList(POLY_XLU_DISP++, D_060105E0); osSyncPrintf("FF DRAW 2\n"); } diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 972d1834de..84fbd626a3 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -1083,9 +1083,9 @@ void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80026230(globalCtx, &sMergeColor, this->actionTarget % 0x28, 0x28); } - oGfxCtx->polyOpa.p = + POLY_OPA_DISP = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, - EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, oGfxCtx->polyOpa.p); + EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, POLY_OPA_DISP); if (this->collider.base.type == COLTYPE_UNK12) { func_80026608(globalCtx); } @@ -1102,9 +1102,9 @@ void EnFloormas_DrawHighlighted(Actor* thisx, GlobalContext* globalCtx) { if (this->collider.base.type == COLTYPE_UNK12) { func_80026690(globalCtx, &sMergeColor, this->actionTarget % 0x28, 0x28); } - oGfxCtx->polyXlu.p = + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, - EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, oGfxCtx->polyXlu.p); + EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, POLY_XLU_DISP); if (this->collider.base.type == COLTYPE_UNK12) { func_80026A6C(globalCtx); } diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 7eba25741c..31be7854be 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -302,8 +302,8 @@ void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fu.c", 773); func_800943C8(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->facialExpression])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthSegments[this->facialExpression])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->facialExpression])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthSegments[this->facialExpression])); SkelAnime_DrawSV(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, this->skelanime.dListCount, EnFu_OverrideLimbDraw, EnFu_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 657ddb2f0b..48295a5a2e 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -100,18 +100,18 @@ void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("ORGAN DRAW 1\n"); func_80093D18(globalCtx->state.gfxCtx); if ((thisx->params == 1) && (dorf->organFadeTimer != 0xff)) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80A280BC(globalCtx->state.gfxCtx, dorf)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80A28148(globalCtx->state.gfxCtx, dorf)); + gSPSegment(POLY_OPA_DISP++, 0x08, func_80A280BC(globalCtx->state.gfxCtx, dorf)); + gSPSegment(POLY_OPA_DISP++, 0x09, func_80A28148(globalCtx->state.gfxCtx, dorf)); } else { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, EnGanonOrgan_EmptyDList(globalCtx->state.gfxCtx)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, EnGanonOrgan_EmptyDList(globalCtx->state.gfxCtx)); + gSPSegment(POLY_OPA_DISP++, 0x08, EnGanonOrgan_EmptyDList(globalCtx->state.gfxCtx)); + gSPSegment(POLY_OPA_DISP++, 0x09, EnGanonOrgan_EmptyDList(globalCtx->state.gfxCtx)); } Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 221), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 221), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_80A2CCA8); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_80A2EAB0); + gSPDisplayList(POLY_OPA_DISP++, D_80A2CCA8); + gSPDisplayList(POLY_OPA_DISP++, D_80A2EAB0); osSyncPrintf("ORGAN DRAW 2\n"); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230); diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 35aae79be3..0b1cce714c 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -341,7 +341,7 @@ s32 func_80A4CB78(EnGoroiwa* this, GlobalContext* globalCtx) { Vec3f sp5C; f32 temp_f0_2; s32 pad2; - u32 sp50; + s32 sp50; Vec3f sp44; WaterBox* waterBox; f32 ySurface; diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 8f9ba39f15..d1b9c005ed 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -5,6 +5,7 @@ */ #include "z_en_gs.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x02000009 @@ -114,11 +115,11 @@ void func_80A4E470(EnGs* this, GlobalContext* globalCtx) { (globalCtx->msgCtx.unk_E3F2 == 8) || (globalCtx->msgCtx.unk_E3F2 == 9) || (globalCtx->msgCtx.unk_E3F2 == 10)) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, 2); + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_HEAL_TIMED); Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); } else if (globalCtx->msgCtx.unk_E3F2 == 11) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, 7); + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_HEAL_BIG); Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); } this->unk_19D = 0; @@ -541,19 +542,19 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ(this->unk_1A0[1].z * 0.0000958738f, MTXMODE_APPLY); } - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1064), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1064), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000950); + gSPDisplayList(POLY_OPA_DISP++, D_06000950); if (this->unk_19E & 4) { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, this->flashColor.r, this->flashColor.g, this->flashColor.b, + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->flashColor.r, this->flashColor.g, this->flashColor.b, this->flashColor.a); } else { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 255, 255, 255, 255); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); } - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060009D0); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000A60); + gSPDisplayList(POLY_OPA_DISP++, D_060009D0); + gSPDisplayList(POLY_OPA_DISP++, D_06000A60); Matrix_Pull(); if (this->unk_19E & 2) { @@ -561,14 +562,14 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800D1FD4(&globalCtx->mf_11DA0); Matrix_Scale(0.05f, -0.05f, 1.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1087), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1087), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment( - oGfxCtx->polyXlu.p++, 0x08, + POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, -frames * 0x14, 0x20, 0x80)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 128, 128, 255, 255, 0, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 0, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_gs.c", 1101); diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 2225c36d2e..2250486be3 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -225,9 +225,9 @@ void EnGuest_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80A50708(globalCtx->state.gfxCtx, 0xFF, 0xFF, 0xFF, 0xFF)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80A50708(globalCtx->state.gfxCtx, 0xA0, 0x3C, 0xDC, 0xFF)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(D_80A50BA4[this->unk_30E])); + gSPSegment(POLY_OPA_DISP++, 0x08, func_80A50708(globalCtx->state.gfxCtx, 0xFF, 0xFF, 0xFF, 0xFF)); + gSPSegment(POLY_OPA_DISP++, 0x09, func_80A50708(globalCtx->state.gfxCtx, 0xA0, 0x3C, 0xDC, 0xFF)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_80A50BA4[this->unk_30E])); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnGuest_OverrideLimbDraw, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index da7958dffe..2cdd224cb4 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -832,9 +832,9 @@ void EnHeishi2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList void func_80A54C6C(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1772); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1774), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1774), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_06002C10); + gSPDisplayList(POLY_OPA_DISP++, &D_06002C10); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1777); } @@ -858,10 +858,10 @@ void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ(DEGTORAD(70.0), MTXMODE_APPLY); mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1820) - 7; - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[linkObjBankIndex].segment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0D, mtx); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_0602B060); - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[linkObjBankIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x0D, mtx); + gSPDisplayList(POLY_OPA_DISP++, &D_0602B060); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); } } diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index ab905325bd..7d3cb4519c 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -347,10 +347,10 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->planeAlpha != 0) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_holl.c", 805); if (this->planeAlpha == 255) { - gfxP = oGfxCtx->polyOpa.p; + gfxP = POLY_OPA_DISP; setupDLIdx = 37; } else { - gfxP = oGfxCtx->polyXlu.p; + gfxP = POLY_XLU_DISP; setupDLIdx = 0; } gfxP = Gfx_CallSetupDL(gfxP, setupDLIdx); @@ -364,9 +364,9 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(gfxP++, sPlaneDlist); if (this->planeAlpha == 255) { - oGfxCtx->polyOpa.p = gfxP; + POLY_OPA_DISP = gfxP; } else { - oGfxCtx->polyXlu.p = gfxP; + POLY_XLU_DISP = gfxP; } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_holl.c", 831); } diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index e7dc6549f0..fda3836a52 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -658,23 +658,23 @@ void EnHorseNormal_Draw(Actor* thisx, GlobalContext* globalCtx) { if (mtx1 == NULL) { return; } - gSPMatrix(oGfxCtx->polyOpa.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(oGfxCtx->polyOpa.p++, mtx1, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, mtx1, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_800A63CC(&this->actor, globalCtx, &this->skin, 0, 0, 1, 0, 3); this->cloneCollider.dim.pos.x = clonePos.x; this->cloneCollider.dim.pos.y = clonePos.y; this->cloneCollider.dim.pos.z = clonePos.z; CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->cloneCollider.base); func_80094044(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, 255); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); Matrix_Translate(clonePos.x, clonePos.y, clonePos.z, MTXMODE_NEW); temp_f0_4 = (1.0f - (distFromGround * 0.01f)) * this->actor.shape.unk_10; Matrix_Scale(this->actor.scale.x * temp_f0_4, 1.0f, this->actor.scale.z * temp_f0_4, MTXMODE_APPLY); Matrix_RotateY(cloneRotY * (2.0f * M_PI / 0x10000), MTXMODE_APPLY); mtx2 = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_horse_normal.c", 2329); if (mtx2 != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04049AD0); + gSPMatrix(POLY_XLU_DISP++, mtx2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_04049AD0); } } diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 1d08efb605..775a9d8b3d 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -346,20 +346,20 @@ void EnIceHono_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 695); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (globalCtx->state.frames * -20) % 512, 32, 128)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 170, 255, 255, this->alpha); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 170, 255, 255, this->alpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 150, 255, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 150, 255, 0); Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) - this->actor.shape.rot.y + 0x8000) * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 718), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 718), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 722); } diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 973c46a365..8bd8cf801d 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -774,7 +774,7 @@ void EnInsect_Update(Actor* thisx, GlobalContext* globalCtx) { } if (!(this->unk_314 & 8) && D_80A7DEB4 < 4 && func_80A7BE6C(this, globalCtx) != 0 && - func_8002F434(&this->actor, globalCtx, 0x7E, 60.0f, 30.0f) != 0) { + func_8002F434(&this->actor, globalCtx, GI_MAX, 60.0f, 30.0f) != 0) { D_80A7DEB4++; } } diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 4e8d84a607..0b6f39153b 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -459,10 +459,10 @@ void EnIshi_DrawLarge(EnIshi* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1050); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1055), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1055), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 255, 255, 255, 255); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_0500A3B8); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); + gSPDisplayList(POLY_OPA_DISP++, D_0500A3B8); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1062); } diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index a404fbd2ed..fac7a11ff9 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -482,7 +482,7 @@ void EnKz_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_kz.c", 1259); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeSegments[this->eyeIdx])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeSegments[this->eyeIdx])); func_800943C8(globalCtx->state.gfxCtx); SkelAnime_DrawSV(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, this->skelanime.dListCount, EnKz_OverrideLimbDraw, EnKz_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index 531af5facb..0ac8109e4e 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -168,22 +168,22 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.params >= 0) { gSPSegment( - oGfxCtx->polyXlu.p++, 0x08, + POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (this->timer * -20) & 511, 32, 128)); dList = D_0404D4E0; - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, flameParams->primColor.r, flameParams->primColor.g, + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, flameParams->primColor.r, flameParams->primColor.g, flameParams->primColor.b, flameParams->primColor.a); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, flameParams->envColor.r, flameParams->envColor.g, flameParams->envColor.b, + gDPSetEnvColor(POLY_XLU_DISP++, flameParams->envColor.r, flameParams->envColor.g, flameParams->envColor.b, 0); } else { - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 32, 1, ((this->timer * 2) & 63), (this->timer * -6) & 127 * 1, 16, 32)); dList = D_05000440; - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0xC0, 0xC0, 255, 200, 0, 0); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0xC0, 0xC0, 255, 200, 0, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); } Matrix_RotateY((s16)((func_8005A9F4(ACTIVE_CAM) - this->actor.shape.rot.y) + 0x8000) * (M_PI / 32768.0f), @@ -194,9 +194,9 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_light.c", 488), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_light.c", 488), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, dList); + gSPDisplayList(POLY_XLU_DISP++, dList); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_light.c", 491); } diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index e70c062146..fbe62c2d76 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -441,8 +441,8 @@ void EnMa1_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800F6268(someFloat, 0x2F); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA16C4[this->unk_1E6])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA16D0[this->unk_1E4])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA16C4[this->unk_1E6])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA16D0[this->unk_1E4])); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnMa1_OverrideLimbDraw, EnMa1_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 134eff97c4..81415ee498 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -358,7 +358,7 @@ void EnMa2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Matrix_MultVec3f(&vec, &this->actor.posRot2.pos); } if ((limbIndex == 14) && (this->skelAnime.animCurrentSeg == &D_060093BC)) { - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06005420); + gSPDisplayList(POLY_OPA_DISP++, D_06005420); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma2.c", 927); @@ -377,8 +377,8 @@ void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800F6268(someFloat, 0x2F); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA28B4[this->unk_210])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA28C0[this->unk_20E])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA28B4[this->unk_210])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA28C0[this->unk_20E])); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnMa2_OverrideLimbDraw, EnMa2_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 2423df6535..826f5ca1cf 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -338,7 +338,7 @@ void EnMa3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Matrix_MultVec3f(&vec, &thisx->posRot2.pos); } if ((limbIndex == 14) && (this->skelAnime.animCurrentSeg == &D_060093BC)) { - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_06005420); + gSPDisplayList(POLY_OPA_DISP++, &D_06005420); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma3.c", 950); @@ -357,8 +357,8 @@ void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800F6268(someFloat, 0x2F); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA38A4[this->unk_210])); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA38B0[this->unk_20E])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA38A4[this->unk_210])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA38B0[this->unk_20E])); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnMa3_OverrideLimbDraw, EnMa3_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 2484df44a1..2710a351cc 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -575,15 +575,15 @@ void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_mag.c", 1151); - gfxRef = oGfxCtx->polyOpa.p; + gfxRef = POLY_OPA_DISP; gfx = Graph_GfxPlusOne(gfxRef); - gSPDisplayList(oGfxCtx->overlay.p++, gfx); + gSPDisplayList(OVERLAY_DISP++, gfx); EnMag_DrawInner(thisx, globalCtx, &gfx); gSPEndDisplayList(gfx++); Graph_BranchDlist(gfxRef, gfx); - oGfxCtx->polyOpa.p = gfx; + POLY_OPA_DISP = gfx; CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_mag.c", 1161); } diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 7c87510274..479ee6004d 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -1,4 +1,11 @@ +/* + * File: z_en_md.c + * Overlay: ovl_En_Md + * Description: Mido + */ + #include "z_en_md.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x02000019 @@ -602,7 +609,7 @@ void EnMd_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.unk_1F = 6; this->alpha = 255; Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 3); + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_KOKIRI); if (((globalCtx->sceneNum == SCENE_SPOT04) && !(gSaveContext.eventChkInf[0] & 0x10)) || ((globalCtx->sceneNum == SCENE_SPOT04) && (gSaveContext.eventChkInf[0] & 0x10) && @@ -811,10 +818,10 @@ void EnMd_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_md.c", 1280); if (this->alpha == 255) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); func_80034BA0(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); } else if (this->alpha != 0) { - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); func_80034CC4(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); } diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 5263a7b377..3a8088dd42 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -1,4 +1,12 @@ +/* + * File: z_en_niw.c + * Overlay: ovl_En_Niw + * Description: Cucco + */ + +#include #include "z_en_niw.h" +#include "overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h" #define FLAGS 0x00800010 @@ -9,7 +17,26 @@ void EnNiw_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnNiw_Update(Actor* thisx, GlobalContext* globalCtx); void EnNiw_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnNiw_ResetAction(EnNiw* this, GlobalContext* globalCtx); +void func_80AB6324(EnNiw* this, GlobalContext* globalCtx); +void func_80AB63A8(EnNiw* this, GlobalContext* globalCtx); +void func_80AB6450(EnNiw* this, GlobalContext* globalCtx); +void func_80AB6570(EnNiw* this, GlobalContext* globalCtx); +void func_80AB6A38(EnNiw* this, GlobalContext* globalCtx); +void func_80AB6BF8(EnNiw* this, GlobalContext* globalCtx); +void func_80AB6D08(EnNiw* this, GlobalContext* globalCtx); +void func_80AB6EB4(EnNiw* this, GlobalContext* globalCtx); +void func_80AB70F8(EnNiw* this, GlobalContext* globalCtx); +void func_80AB714C(EnNiw* this, GlobalContext* globalCtx); +void func_80AB7204(EnNiw* this, GlobalContext* globalCtx); +void func_80AB7290(EnNiw* this, GlobalContext* globalCtx); +void func_80AB7328(EnNiw* this, GlobalContext* globalCtx); +void EnNiw_FeatherSpawn(EnNiw* this, Vec3f* pos, Vec3f* vel, Vec3f* accel, f32 scale); +void EnNiw_FeatherUpdate(EnNiw* this, GlobalContext* globalCtx); +void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx); + +static s16 D_80AB85E0 = 0; + const ActorInit En_Niw_InitVars = { ACTOR_EN_NIW, ACTORTYPE_PROP, @@ -21,61 +48,1159 @@ const ActorInit En_Niw_InitVars = { (ActorFunc)EnNiw_Update, (ActorFunc)EnNiw_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s") +static f32 D_80AB8604[] = { + 5000.0f, + -5000.0f, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s") +static f32 D_80AB860C[] = { + 5000.0f, + 3000.0f, + 4000.0f, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s") +static Vec3f sKakarikoPosList[] = { + { -1697.0f, 80.0f, 870.0f }, { 57.0f, 320.0f, -673.0f }, { 796.0f, 80.0f, 1639.0f }, { 1417.0f, 465.0f, 169.0f }, + { -60.0f, 0.0f, -46.0f }, { -247.0f, 80.0f, 854.0f }, { 1079.0f, 80.0f, -47.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s") +static s16 sKakarikoFlagList[] = { + 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s") +static u8 sLowerRiverSpawned = false; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s") +static u8 sUpperRiverSpawned = false; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s") +static ColliderCylinderInit sCylinderInit1 = { + { COLTYPE_UNK5, 0x00, 0x09, 0x01, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 15, 25, 4, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s") +static ColliderCylinderInit sCylinderInit2 = { + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 15, 25, 4, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s") +static InitChainEntry sInitChain[] = { + ICHAIN_U8(unk_1F, 6, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 0, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s") +extern SkeletonHeader D_06002530; +extern AnimationHeader D_060000E8; +extern Gfx D_060023B0[]; +extern Gfx D_06002428[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s") +void EnNiw_Init(Actor* thisx, GlobalContext* globalCtx) { + EnNiw* this = THIS; + s32 pad; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s") + if (this->actor.params < 0) { + this->actor.params = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s") + // Cucco at at the very beginning of Zora's River + if (this->actor.params == 0xB) { + if (sLowerRiverSpawned) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n" VT_RST); + return; + } + sLowerRiverSpawned = true; + this->actor.room = -1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s") + // Cucco at tall platform in the first room of Zora's River + if (this->actor.params == 0xC) { + if (sUpperRiverSpawned) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n" VT_RST); + return; + } + sUpperRiverSpawned = true; + this->actor.room = -1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + this->actor.flags |= 1; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 25.0f); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06002530, &D_060000E8, this->limbDrawTable, + this->transitionDrawTable, 16); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s") + if (globalCtx->sceneNum == SCENE_SPOT01) { + for (i = 0; i < ARRAY_COUNT(sKakarikoPosList); i++) { + if (fabsf(this->actor.posRot.pos.x - sKakarikoPosList[i].x) < 40.0f && + fabsf(this->actor.posRot.pos.z - sKakarikoPosList[i].z) < 40.0f) { + this->unk_2AA = i; + osSyncPrintf(VT_FGCOL(YELLOW) " 通常鶏index %d\n" VT_RST, this->unk_2AA); + if (gSaveContext.infTable[25] & sKakarikoFlagList[i]) { + this->actor.posRot.pos.x = 300.0f; + this->actor.posRot.pos.y = 100.0f; + this->actor.posRot.pos.z = 1530.0f; + this->actor.params = 0; + } + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s") + Math_Vec3f_Copy(&this->unk_2AC, &this->actor.posRot.pos); + Math_Vec3f_Copy(&this->unk_2B8, &this->actor.posRot.pos); + this->unk_304 = 10.0f; + Actor_SetScale(&this->actor, 0.01f); + this->unk_2A4 = (s16)Math_Rand_ZeroFloat(3.99f) + 5; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s") + if (this->unk_2A4 < 0) { + this->unk_2A4 = 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s") + switch (this->actor.params) { + case 2: + if (!gSaveContext.nightFlag) { + Actor_Kill(&this->actor); + } + break; + case 1: + if (gSaveContext.eventChkInf[1] & 0x10) { + Actor_Kill(&this->actor); + } + break; + case 3: + if (!(gSaveContext.eventChkInf[1] & 0x10)) { + Actor_Kill(&this->actor); + } + break; + case 5: + if (gSaveContext.eventChkInf[1] & 0x100) { + Actor_Kill(&this->actor); + } + break; + case 7: + if (!(gSaveContext.eventChkInf[1] & 0x100)) { + Actor_Kill(&this->actor); + } + break; + case 0xD: + this->actor.gravity = 0.0f; + case 0xE: + this->actor.colChkInfo.mass = 0; + this->actor.flags &= ~1; + break; + case 4: + this->actor.gravity = 0.0f; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s") + Collider_InitCylinder(globalCtx, &this->collider); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s") + switch (this->actor.params) { + case 0xA: + this->actor.colChkInfo.mass = 0xFF; + case 0xD: + case 0xE: + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit2); + if (globalCtx->sceneNum == SCENE_LINK_HOME && !(gSaveContext.eventChkInf[1] & 0x4000)) { + Actor_Kill(&this->actor); + } + break; + default: + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit1); + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s") + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + osSyncPrintf("\n\n"); + this->actionFunc = EnNiw_ResetAction; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s") +void EnNiw_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnNiw* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s") +void func_80AB5BF8(EnNiw* this, GlobalContext* globalCtx, s16 arg2) { + f32 factor = 1.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s") + if (this->actor.params == 0xD) { + factor = 2.0f; + } + if (this->timer1 == 0) { + if (arg2 == 0) { + this->unk_26C[0] = 0.0f; + } else { + this->unk_26C[0] = -10000.0f * factor; + } + this->unk_298++; + this->timer1 = 3; + if (!(this->unk_298 & 1)) { + this->unk_26C[0] = 0.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s") + if (arg2 == 0) { + this->timer1 = Math_Rand_ZeroFloat(30.0f); + } + } + } + if (this->timer2 == 0) { + this->unk_29C++; + this->unk_29C &= 1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s") + switch (arg2) { + case 0: + this->unk_26C[1] = this->unk_26C[2] = 0.0f; + break; + case 1: + this->timer2 = 3; + this->unk_26C[1] = this->unk_26C[2] = 7000.0f * factor; + + if (this->unk_29C == 0) { + this->unk_26C[1] = this->unk_26C[2] = 0.0f; + } + break; + case 2: + this->timer2 = 2; + this->unk_26C[1] = this->unk_26C[2] = -10000.0f; + this->unk_26C[7] = this->unk_26C[5] = 25000.0f; + this->unk_26C[8] = this->unk_26C[6] = 6000.0f; + + if (this->unk_29C == 0) { + this->unk_26C[5] = this->unk_26C[7] = 8000.0f; + } + break; + case 3: + this->timer2 = 2; + this->unk_26C[7] = this->unk_26C[5] = 10000.0f; + + if (this->unk_29C == 0) { + this->unk_26C[7] = this->unk_26C[5] = 3000.0f; + } + break; + case 4: + this->timer1 = 5; + break; + case 5: + this->timer2 = 5; + this->unk_26C[7] = this->unk_26C[5] = 14000.0f; + if (this->unk_29C == 0) { + this->unk_26C[7] = this->unk_26C[5] = 10000.0f; + } + break; + } + } + if (this->unk_2E0 != this->unk_26C[9]) { + Math_SmoothScaleMaxF(&this->unk_2E0, this->unk_26C[9], 0.5f, 4000.0f); + } + if (this->unk_2DC != this->unk_26C[0]) { + Math_SmoothScaleMaxF(&this->unk_2DC, this->unk_26C[0], 0.5f, 4000.0f); + } + if (this->unk_2C4 != this->unk_26C[2]) { + Math_SmoothScaleMaxF(&this->unk_2C4, this->unk_26C[2], 0.8f, 7000.0f); + } + if (this->unk_2C8 != this->unk_26C[7]) { + Math_SmoothScaleMaxF(&this->unk_2C8, this->unk_26C[7], 0.8f, 7000.0f); + } + if (this->unk_2CC != this->unk_26C[8]) { + Math_SmoothScaleMaxF(&this->unk_2CC, this->unk_26C[8], 0.8f, 7000.0f); + } + if (this->unk_2D0 != this->unk_26C[1]) { + Math_SmoothScaleMaxF(&this->unk_2D0, this->unk_26C[1], 0.8f, 7000.0f); + } + if (this->unk_2D4 != this->unk_26C[5]) { + Math_SmoothScaleMaxF(&this->unk_2D4, this->unk_26C[5], 0.8f, 7000.0f); + } + if (this->unk_2D8 != this->unk_26C[6]) { + Math_SmoothScaleMaxF(&this->unk_2D8, this->unk_26C[6], 0.8f, 7000.0f); + } +} + +void EnNiw_SpawnAttackCucco(EnNiw* this, GlobalContext* globalCtx) { + f32 viewX; + f32 viewY; + f32 viewZ; + Vec3f attackCuccoPos; + EnAttackNiw* attackCucco; + + if (this->timer5 == 0) { + if (this->unk_296 < 7) { + viewX = globalCtx->view.lookAt.x - globalCtx->view.eye.x; + viewY = globalCtx->view.lookAt.y - globalCtx->view.eye.y; + viewZ = globalCtx->view.lookAt.z - globalCtx->view.eye.z; + attackCuccoPos.x = ((Math_Rand_ZeroOne() - 0.5f) * viewX) + globalCtx->view.eye.x; + attackCuccoPos.y = Math_Rand_CenteredFloat(0.3f) + ((globalCtx->view.eye.y + 50.0f) + (viewY * 0.5f)); + attackCuccoPos.z = ((Math_Rand_ZeroOne() - 0.5f) * viewZ) + globalCtx->view.eye.z; + attackCucco = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ATTACK_NIW, + attackCuccoPos.x, attackCuccoPos.y, attackCuccoPos.z, 0, 0, 0, 0); + + if (attackCucco != NULL) { + this->unk_296++; + this->timer5 = 10; + } else { + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n" VT_RST); + } + } + } +} + +void func_80AB6100(EnNiw* this, GlobalContext* globalCtx, s32 arg2) { + f32 factor; + f32 targetRotY; + + if (this->timer4 == 0) { + this->timer4 = 3; + + if (this->actor.bgCheckFlags & 1) { + this->actor.velocity.y = 3.5f; + } + } + if (this->timer3 == 0) { + this->unk_2A0++; + this->unk_2A0 &= 1; + this->timer3 = 5; + } + if (this->unk_2A0 == 0) { + factor = D_80AB860C[arg2]; + } else { + factor = -D_80AB860C[arg2]; + } + if (arg2 == 1) { + if (this->timer6 == 0 || this->actor.bgCheckFlags & 8) { + this->timer6 = 150; + if (this->timer8 == 0) { + this->timer8 = 70; + this->unk_2E4 = this->actor.yawTowardsLink; + } + } + } + targetRotY = this->unk_2E4 + factor; + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, targetRotY, 3, this->unk_2FC, 0); + Math_SmoothScaleMaxF(&this->unk_2FC, 3000.0f, 1.0f, 500.0f); + func_80AB5BF8(this, globalCtx, 5); +} + +void EnNiw_ResetAction(EnNiw* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060000E8, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060000E8), 0, -10.0f); + + switch (this->actor.params) { + case 4: + this->actionFunc = func_80AB6450; + break; + case 0xD: + this->actionFunc = func_80AB6324; + break; + default: + this->actionFunc = func_80AB6570; + break; + } +} + +void func_80AB6324(EnNiw* this, GlobalContext* globalCtx) { + if (this->unk_308 != 0) { + this->actor.velocity.y = Math_Rand_ZeroFloat(2.0f) + 4.0f; + this->actor.speedXZ = Math_Rand_ZeroFloat(2.0f) + 3.0f; + this->actionFunc = func_80AB63A8; + } + func_80AB5BF8(this, globalCtx, 1); +} + +void func_80AB63A8(EnNiw* this, GlobalContext* globalCtx) { + if (this->actor.bgCheckFlags & 1 && this->actor.velocity.y < 0.0f) { + this->unk_2AC = this->unk_2B8 = this->actor.posRot.pos.x; + this->unk_2B0 = this->unk_2BC = this->actor.posRot.pos.y; + this->unk_2B4 = this->unk_2C0 = this->actor.posRot.pos.z; + this->timer5 = this->timer4 = this->unk_29E = 0; + + this->unk_26C[7] = this->unk_26C[5] = this->unk_26C[6] = this->unk_26C[8] = this->actor.speedXZ = + this->unk_2FC = this->unk_300 = 0.0f; + + this->actionFunc = func_80AB6570; + } else { + func_80AB5BF8(this, globalCtx, 2); + } +} + +void func_80AB6450(EnNiw* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->actor.xzDistFromLink < 30.0f && fabsf(this->actor.posRot.pos.y - player->actor.posRot.pos.y) < 5.0f) { + this->timer6 = 100; + this->actor.gravity = -2.0f; + this->actionFunc = func_80AB7290; + } else if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.gravity = -2.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + this->sfxTimer1 = 30; + this->path = 0; + this->timer4 = 30; + this->actor.flags &= ~1; + this->actor.speedXZ = 0.0f; + this->actionFunc = func_80AB6BF8; + } else { + func_8002F434(&this->actor, globalCtx, 0, 25.0f, 10.0f); + func_80AB5BF8(this, globalCtx, 1); + } +} + +void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { + s32 pad[2]; + f32 posY = Math_Rand_CenteredFloat(100.0f); + f32 posZ = Math_Rand_CenteredFloat(100.0f); + s16 tmp; + + if (this->actor.params != 0xA) { + if (Actor_HasParent(&this->actor, globalCtx)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + this->sfxTimer1 = 30; + this->path = 0; + this->timer4 = 30; + this->actor.flags &= ~1; + this->actor.speedXZ = 0.0f; + this->actionFunc = func_80AB6BF8; + return; + } + func_8002F580(&this->actor, globalCtx); + } else { + if (this->path != 0) { + this->unk_2A6 = 1; + if (this->sfxTimer3 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + this->sfxTimer3 = 100; + } + this->unk_2A0 = Math_Rand_ZeroFloat(1.99f); + this->actor.speedXZ = 4.0f; + this->unk_300 = 0.0f; + this->unk_2FC = 0.0f; + this->actionFunc = func_80AB6A38; + return; + } + } + + tmp = 0; + + if (this->timer5 != 0) { + if (Math_Rand_ZeroFloat(3.99f) < 1.0f) { + this->unk_2E6++; + this->unk_2E6 &= 1; + } + Math_SmoothScaleMaxF(&this->unk_26C[9], D_80AB8604[this->unk_2E6], 0.5f, 4000.0f); + } + + if (this->timer5 == 0 && this->timer4 == 0) { + this->unk_29E++; + + if (this->unk_29E >= 8) { + this->timer5 = Math_Rand_ZeroFloat(30.0f); + this->unk_29E = Math_Rand_ZeroFloat(3.99f); + if (this->actor.params != 0xA && this->actor.params != 8) { + if (posY < 0.0f) { + posY -= 100.0f; + } else { + posY += 100.0f; + } + if (posZ < 0.0f) { + posZ -= 100.0f; + } else { + posZ += 100.0f; + } + } else { + posY = Math_Rand_CenteredFloat(30.0f); + posZ = Math_Rand_CenteredFloat(30.0f); + if (posY < 0.0f) { + posY -= 20.0f; + } else { + posY += 20.0f; + } + if (posZ < 0.0f) { + if (1) {} // Required to match + if (1) {} + if (1) {} + if (1) {} + posZ -= 20.0f; + } else { + posZ += 20.0f; + } + } + this->unk_2B8 = this->unk_2AC + posY; + this->unk_2C0 = this->unk_2B4 + posZ; + } else { + this->timer4 = 4; + if (this->actor.bgCheckFlags & 1) { + this->actor.speedXZ = 0.0f; + this->actor.velocity.y = 3.5f; + } + } + } + + if (this->timer4 != 0) { + Math_SmoothDownscaleMaxF(&this->unk_26C[9], 0.5f, 4000.0f); + tmp = 1; + Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->unk_2B8, 1.0f, this->unk_2FC); + Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, this->unk_2C0, 1.0f, this->unk_2FC); + Math_SmoothScaleMaxF(&this->unk_2FC, 3.0f, 1.0f, 0.3f); + posY = this->unk_2B8 - this->actor.posRot.pos.x; + posZ = this->unk_2C0 - this->actor.posRot.pos.z; + + if (fabsf(posY) < 10.0f) { + posY = 0.0; + } + if (fabsf(posZ) < 10.0f) { + posZ = 0.0; + } + if (posY == 0.0f && posZ == 0.0f) { + this->timer4 = 0; + this->unk_29E = 7; + } + + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_atan2f(posY, posZ) * (0x8000 / M_PI), 3, this->unk_300, + 0); + Math_SmoothScaleMaxF(&this->unk_300, 10000.0f, 1.0f, 1000.0f); + } + + func_80AB5BF8(this, globalCtx, tmp); +} + +void func_80AB6A38(EnNiw* this, GlobalContext* globalCtx) { + Path* path; + Vec3s* pointPos; + f32 pathDiffX; + f32 pathDiffZ; + s16 pathIndex = this->path - 1; + + if (this->path == 0) { + this->unk_2AC = this->unk_2B8 = this->actor.posRot.pos.x; + this->unk_2B0 = this->unk_2BC = this->actor.posRot.pos.y; + this->unk_2B4 = this->unk_2C0 = this->actor.posRot.pos.z; + this->timer5 = this->timer4 = this->unk_29E = 0; + this->unk_26C[7] = this->unk_26C[5] = this->unk_26C[6] = this->unk_26C[8] = this->actor.speedXZ = + this->unk_2FC = this->unk_300 = 0.0f; + this->actionFunc = EnNiw_ResetAction; + } else { + path = &globalCtx->setupPathList[pathIndex]; + pointPos = SEGMENTED_TO_VIRTUAL(path->points); + pointPos += this->waypoint; + pathDiffX = pointPos->x - this->actor.posRot.pos.x; + pathDiffZ = pointPos->z - this->actor.posRot.pos.z; + this->unk_2E4 = Math_atan2f(pathDiffX, pathDiffZ) * (0x8000 / M_PI); + func_80AB6100(this, globalCtx, 2); + + if (fabsf(pathDiffX) < 30.0f && fabsf(pathDiffZ) < 30.0f) { + this->waypoint++; + if (this->waypoint >= this->unk_2EC) { + this->waypoint = 0; + } + } + + func_80AB5BF8(this, globalCtx, 2); + } +} + +void func_80AB6BF8(EnNiw* this, GlobalContext* globalCtx) { + if (this->timer4 == 0) { + this->unk_2A6 = 2; + this->timer4 = 10; + } + + this->actor.shape.rot.x = Math_Rand_CenteredFloat(5000.0f); + this->actor.shape.rot.y = Math_Rand_CenteredFloat(5000.0f); + this->actor.shape.rot.z = Math_Rand_CenteredFloat(5000.0f); + + if (Actor_HasNoParent(&this->actor, globalCtx)) { + if (this->actor.params == 0xD) { + this->sfxTimer1 = 0; + this->unk_2A6 = 1; + this->actionFunc = func_80AB6EB4; + this->actor.velocity.y = 4.0f; + return; + } + this->actor.shape.rot.z = 0; + this->actor.shape.rot.y = this->actor.shape.rot.z; + this->actor.shape.rot.x = this->actor.shape.rot.z; + this->actor.flags |= 1; + this->actionFunc = func_80AB6D08; + } + func_80AB5BF8(this, globalCtx, 2); +} + +void func_80AB6D08(EnNiw* this, GlobalContext* globalCtx) { + if (this->path == 0) { + if (!(this->actor.bgCheckFlags & 1)) { + return; + } + if (this->actor.params == 0xE) { + this->unk_2AC = this->unk_2B8 = this->actor.posRot.pos.x; + this->unk_2B0 = this->unk_2BC = this->actor.posRot.pos.y; + this->unk_2B4 = this->unk_2C0 = this->actor.posRot.pos.z; + this->timer5 = this->timer4 = this->unk_29E = 0; + + this->unk_26C[7] = this->unk_26C[5] = this->unk_26C[6] = this->unk_26C[8] = this->actor.speedXZ = + this->unk_2FC = this->unk_300 = 0.0f; + + this->actionFunc = EnNiw_ResetAction; + return; + } + + this->path = 1; + this->timer5 = 80; + this->actor.speedXZ = 0.0f; + this->actor.velocity.y = 4.0f; + } else { + if (this->actor.bgCheckFlags & 1) { + this->sfxTimer1 = 0; + this->actor.velocity.y = 4.0f; + this->unk_2A6 = 1; + } + if (this->timer5 == 0) { + this->timer6 = 100; + this->timer4 = 0; + this->path = 0; + this->actionFunc = func_80AB7290; + return; + } + } + + if (Actor_HasParent(&this->actor, globalCtx)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + this->sfxTimer1 = 30; + this->path = 0; + this->timer4 = 30; + this->actor.flags &= ~1; + this->actor.speedXZ = 0.0f; + this->actionFunc = func_80AB6BF8; + } else { + if (this->timer5 >= 6) { + func_8002F580(&this->actor, globalCtx); + } + func_80AB5BF8(this, globalCtx, 2); + } +} + +void func_80AB6EB4(EnNiw* this, GlobalContext* globalCtx) { + if (this->actor.posRot.pos.y > 400.0f) { + Actor_Kill(&this->actor); + } + + func_80AB5BF8(this, globalCtx, 2); +} + +void func_80AB6F04(EnNiw* this, GlobalContext* globalCtx) { + Vec3f pos; + + if (this->unk_2A8 != 0) { + EnNiw_SpawnAttackCucco(this, globalCtx); + } + + this->actor.speedXZ = 2.0f; + + if (this->actor.bgCheckFlags & 0x20) { + this->actor.gravity = 0.0f; + + if (this->actor.waterY > 15.0f) { + this->actor.posRot.pos.y += 2.0f; + } + if (this->timer4 == 0) { + this->timer4 = 30; + Math_Vec3f_Copy(&pos, &this->actor.posRot.pos); + pos.y += this->actor.waterY; + EffectSsGRipple_Spawn(globalCtx, &pos, 100, 500, 30); + } + if (this->actor.bgCheckFlags & 8) { + this->actor.velocity.y = 10.0f; + this->actor.speedXZ = 1.0f; + } + } else { + this->actor.gravity = -2.0f; + + if (this->actor.bgCheckFlags & 8) { + this->actor.velocity.y = 10.0f; + this->actor.speedXZ = 1.0f; + this->actor.gravity = 0.0f; + } else { + this->actor.speedXZ = 4.0f; + } + if (this->actor.bgCheckFlags & 1) { + this->actor.gravity = -2.0f; + this->timer6 = 100; + this->timer4 = 0; + this->actor.velocity.y = 0.0f; + if (this->unk_2A8 == 0) { + this->actionFunc = func_80AB7290; + } else { + this->actionFunc = func_80AB7204; + } + } + } + + func_80AB5BF8(this, globalCtx, 2); +} + +void func_80AB70A0(EnNiw* this, GlobalContext* globalCtx) { + func_800800F8(globalCtx, 0x8F2, -0x63, &this->actor, 0); + this->timer5 = 100; + this->unk_2A2 = 1; + this->actionFunc = func_80AB70F8; +} + +void func_80AB70F8(EnNiw* this, GlobalContext* globalCtx) { + this->sfxTimer1 = 100; + + if (this->timer5 == 0) { + this->timer5 = 60; + this->timer1 = 10; + this->unk_2A2 = 4; + this->actionFunc = func_80AB714C; + } + + func_80AB5BF8(this, globalCtx, this->unk_2A2); +} + +void func_80AB714C(EnNiw* this, GlobalContext* globalCtx) { + this->sfxTimer1 = 100; + + if (this->timer5 == 40) { + this->unk_26C[0] = 10000.0f; + this->unk_26C[7] = 14000.0f; + this->unk_26C[5] = 14000.0f; + this->unk_26C[6] = 0.0f; + this->unk_26C[8] = 0.0f; + this->unk_26C[1] = 0.0f; + this->unk_26C[2] = 0.0f; + this->timer1 = 10; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + } + if (this->timer5 == 0) { + this->timer7 = 10; + this->unk_2E4 = this->actor.yawTowardsLink; + this->actor.flags &= ~1; + this->actionFunc = func_80AB7204; + } + + func_80AB5BF8(&this->actor, globalCtx, this->unk_2A2); +} + +void func_80AB7204(EnNiw* this, GlobalContext* globalCtx) { + EnNiw_SpawnAttackCucco(this, globalCtx); + + if (this->timer7 < 2) { + if (this->timer7 == 1) { + this->actor.speedXZ = 3.0f; + this->unk_2A0 = Math_Rand_ZeroFloat(1.99f); + this->timer1 = this->timer2 = this->timer3 = this->timer4 = 0; + } else { + func_80AB6100(this, globalCtx, 1); + } + } +} + +void func_80AB7290(EnNiw* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060000E8, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060000E8), 0, -10.0f); + this->unk_2A0 = Math_Rand_ZeroFloat(1.99f); + this->actor.speedXZ = 4.0f; + this->actionFunc = func_80AB7328; +} + +void func_80AB7328(EnNiw* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->timer6 == 0) { + this->unk_2AC = this->unk_2B8 = this->actor.posRot.pos.x; + this->unk_2B0 = this->unk_2BC = this->actor.posRot.pos.y; + this->unk_2B4 = this->unk_2C0 = this->actor.posRot.pos.z; + this->timer5 = this->timer4 = this->unk_29E = 0; + this->unk_26C[7] = this->unk_26C[5] = this->unk_26C[6] = this->unk_26C[8] = this->actor.speedXZ = + this->unk_2FC = this->unk_300 = 0.0f; + if (this->actor.params == 4) { + this->actor.params = 0; + } + this->actionFunc = EnNiw_ResetAction; + } else { + this->unk_2E4 = Math_atan2f(this->actor.posRot.pos.x - player->actor.posRot.pos.x, + this->actor.posRot.pos.z - player->actor.posRot.pos.z) * + (0x8000 / M_PI); + func_80AB6100(this, globalCtx, 0); + func_80AB5BF8(this, globalCtx, 2); + } +} + +void func_80AB7420(EnNiw* this, GlobalContext* globalCtx) { + if (this->actor.bgCheckFlags & 1) { + this->unk_2A4 = (s16)Math_Rand_ZeroFloat(3.99f) + 5; + this->actionFunc = EnNiw_ResetAction; + } +} + +void func_80AB747C(EnNiw* this, GlobalContext* globalCtx) { + if (this->unk_2A8 == 0 && this->actor.params != 0xA && this->actionFunc != func_80AB6450 && + this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + this->sfxTimer1 = 30; + if (this->unk_2A4 > 0 && D_80AB85E0 == 0) { + this->unk_2A4--; + } + this->unk_2A6 = 1; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + this->timer6 = 100; + this->path = 0; + this->actionFunc = func_80AB7290; + } +} + +void EnNiw_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad1; + EnNiw* this = THIS; + Player* player = PLAYER; + s16 i; + s16 featherCount; + Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; + Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; + Vec3f pos; + Vec3f vel; + Vec3f accel; + s32 pad2; + f32 scale; + Vec3f cam; + f32 dist; + f32 camResult; + s32 pad3[10]; + + if (1) {} // Required to match + if (1) {} + if (1) {} + + this->unk_294++; + + if (this->actionFunc != func_80AB6570) { + this->unk_26C[9] = 0.0f; + } + if (this->unk_2A6) { + featherCount = 20; + + if (this->unk_2A6 == 2) { + featherCount = 4; + } + + for (i = 0; i < featherCount; i++) { + pos.x = Math_Rand_CenteredFloat(10.0f) + thisx->posRot.pos.x; + pos.y = Math_Rand_CenteredFloat(10.0f) + (thisx->posRot.pos.y + this->unk_304); + pos.z = Math_Rand_CenteredFloat(10.0f) + thisx->posRot.pos.z; + scale = Math_Rand_ZeroFloat(6.0f) + 6.0f; + + if (this->unk_2A6 == 2 && this->unk_304 != 0) { + pos.y += 10; + } + if (this->unk_304 == 0) { + scale = Math_Rand_ZeroFloat(2.0f) + 2; + } + + vel.x = Math_Rand_CenteredFloat(3.0f); + vel.y = (Math_Rand_ZeroFloat(2.0f) * 0.5f) + 2.0f; + vel.z = Math_Rand_CenteredFloat(3.0f); + accel.x = 0.0f; + accel.y = -0.15f; + accel.z = 0.0f; + EnNiw_FeatherSpawn(this, &pos, &vel, &accel, scale); + } + + this->unk_2A6 = 0; + } + + EnNiw_FeatherUpdate(&this->actor, globalCtx); + if (this->timer1 != 0) { + this->timer1--; + } + if (this->timer2 != 0) { + this->timer2--; + } + if (this->timer3 != 0) { + this->timer3--; + } + if (this->timer4 != 0) { + this->timer4--; + } + if (this->timer5 != 0) { + this->timer5--; + } + if (this->timer7 != 0) { + this->timer7--; + } + if (this->timer6 != 0) { + this->timer6--; + } + if (this->sfxTimer1 != 0) { + this->sfxTimer1--; + } + if (this->sfxTimer2 != 0) { + this->sfxTimer2--; + } + if (this->sfxTimer3 != 0) { + this->sfxTimer3--; + } + if (this->timer8 != 0) { + this->timer8--; + } + if (this->timer9 != 0) { + this->timer9--; + } + thisx->shape.rot = thisx->posRot.rot; + thisx->shape.unk_10 = 15.0f; + this->actionFunc(this, globalCtx); + Actor_SetHeight(&this->actor, this->unk_304); + Actor_MoveForward(&this->actor); + + if (this->actionFunc != func_80AB6EB4 && this->actionFunc != func_80AB6450 && globalCtx->sceneNum != SCENE_SPOT03) { + func_8002E4B4(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 31); + } + if (globalCtx->sceneNum == SCENE_SPOT03) { + func_8002E4B4(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 29); + } + if (thisx->groundY <= -32000.0f || thisx->groundY >= 32000.0f) { + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n" VT_RST, thisx->groundY); + cam.x = globalCtx->view.lookAt.x - globalCtx->view.eye.x; + cam.y = globalCtx->view.lookAt.y - globalCtx->view.eye.y; + cam.z = globalCtx->view.lookAt.z - globalCtx->view.eye.z; + camResult = cam.y / sqrtf(SQ(cam.x) + SQ(cam.y) + SQ(cam.z)); + osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->posRot.pos.x); + osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->posRot.pos.y); + osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->posRot.pos.z); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->initPosRot.pos.x); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->initPosRot.pos.y); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->initPosRot.pos.z); + thisx->posRot.pos.x = thisx->initPosRot.pos.x; + thisx->posRot.pos.z = thisx->initPosRot.pos.z; + thisx->posRot.pos.y = ((thisx->initPosRot.pos.y + globalCtx->view.eye.y) + (camResult * 160.0f)); + + if (thisx->posRot.pos.y < thisx->initPosRot.pos.y) { + thisx->posRot.pos.y = thisx->initPosRot.pos.y + 300.0f; + } + + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->posRot.pos.x); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->posRot.pos.y); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->posRot.pos.z); + osSyncPrintf("\n\n"); + thisx->speedXZ = 0.0f; + thisx->gravity = -2.0f; + Math_Vec3f_Copy(&this->unk_2AC, &thisx->initPosRot); + Math_Vec3f_Copy(&this->unk_2B8, &thisx->initPosRot); + this->unk_300 = 0.0f; + this->unk_2FC = 0.0f; + this->unk_2F0.z = 0.0f; + this->unk_2F0.y = 0.0f; + this->unk_2F0.x = 0.0f; + this->unk_2D8 = 0.0f; + this->unk_2D4 = 0.0f; + this->unk_2D0 = 0.0f; + this->unk_2CC = 0.0f; + this->unk_2C8 = 0.0f; + this->unk_2C4 = 0.0f; + this->unk_2DC = 0.0f; + this->unk_2E0 = 0.0f; + this->unk_2A8 = this->unk_294 = this->unk_298 = this->unk_2A6 = this->unk_29E = this->unk_2A0 = this->unk_2A2 = + 0; + + for (i = 0; i < ARRAY_COUNT(this->unk_26C); i++) { + this->unk_26C[i] = 0; + } + + this->unk_2A8 = 0; + this->actionFunc = func_80AB7420; + return; + } + + if (thisx->bgCheckFlags & 0x20 && thisx->waterY > 15.0f && this->actionFunc != func_80AB6F04 && + thisx->params != 0xD && thisx->params != 0xE && thisx->params != 0xA) { + thisx->velocity.y = 0.0f; + thisx->gravity = 0.0f; + Math_Vec3f_Copy(&pos, &thisx->posRot); + pos.y += thisx->waterY; + this->timer4 = 30; + EffectSsGSplash_Spawn(globalCtx, &pos, 0, 0, 0, 400); + this->timer5 = 0; + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n" VT_RST); + osSyncPrintf("\n\n"); + this->actionFunc = func_80AB6F04; + return; + } + + if (D_80AB85E0 == 0 && this->unk_2A4 <= 0 && thisx->params != 0xD && thisx->params != 0xE && thisx->params != 0xA) { + this->timer6 = 100; + + if (thisx->xzDistFromLink > 10.0f) { + D_80AB85E0 = 1; + this->timer5 = this->timer4 = this->unk_29E = 0; + thisx->speedXZ = 0.0f; + this->unk_2FC = 0.0f; + this->unk_300 = 0.0f; + this->unk_26C[7] = 0.0f; + this->unk_26C[5] = 0.0f; + this->unk_26C[6] = 0.0f; + this->unk_26C[8] = 0.0f; + this->sfxTimer1 = 10000; + this->unk_2A8 = 1; + this->unk_2AC = this->unk_2B8 = thisx->posRot.pos.x; + this->unk_2B0 = this->unk_2BC = thisx->posRot.pos.y; + this->unk_2B4 = this->unk_2C0 = thisx->posRot.pos.z; + this->actionFunc = func_80AB70A0; + return; + } + } + + dist = 20.0f; + + if (this->unk_2A8 != 0 && thisx->xyzDistFromLinkSq < SQ(dist) && player->invincibilityTimer == 0) { + func_8002F6D4(globalCtx, &this->actor, 2.0f, thisx->posRot.rot.y, 0.0f, 0x10); + } + + func_80AB747C(&this->actor, globalCtx); + + if (this->sfxTimer2 == 0 && this->actionFunc == func_80AB6BF8) { + this->sfxTimer2 = 7; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEKU_WAKEUP); + } + if (this->sfxTimer1 == 0) { + if (this->actionFunc != func_80AB6570) { + this->sfxTimer1 = 30; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_A); + } else { + this->sfxTimer1 = 300; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_N); + } + } + if (this->unk_2A8 == 0) { + Collider_CylinderUpdate(&this->actor, &this->collider); + + if (thisx->params != 0xA && thisx->params != 0xD && thisx->params != 0xE && thisx->params != 4) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); + } + if (this->actionFunc != func_80AB6BF8 && this->actionFunc != func_80AB6D08 && + this->actionFunc != func_80AB6324 && this->actionFunc != func_80AB63A8 && + this->actionFunc != func_80AB6450) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + } + } +} + +s32 EnNiw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + EnNiw* this = THIS; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + + if (limbIndex == 13) { + rot->y += (s16)this->unk_2DC; + } + if (limbIndex == 15) { + rot->y += (s16)this->unk_2E0; + } + if (limbIndex == 11) { + rot->x += (s16)this->unk_2D8; + rot->y += (s16)this->unk_2D4; + rot->z += (s16)this->unk_2D0; + } + if (limbIndex == 7) { + rot->x += (s16)this->unk_2CC; + rot->y += (s16)this->unk_2C8; + rot->z += (s16)this->unk_2C4; + } + + return 0; +} + +void EnNiw_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnNiw* this = THIS; + Vec3f scale = { 0.15f, 0.15f, 0.15f }; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + EnNiw_OverrideLimbDraw, NULL, &this->actor); + + if (this->actionFunc == func_80AB6450) { + func_80033C30(&this->actor.posRot.pos, &scale, 255, globalCtx); + } + + EnNiw_FeatherDraw(this, globalCtx); +} + +void EnNiw_FeatherSpawn(EnNiw* this, Vec3f* pos, Vec3f* vel, Vec3f* accel, f32 scale) { + s16 i; + EnNiwFeather* feather = this->feathers; + + for (i = 0; i < ARRAY_COUNT(this->feathers); i++, feather++) { + if (feather->type == 0) { + feather->type = 1; + feather->pos = *pos; + feather->vel = *vel; + feather->accel = *accel; + feather->timer = 0; + feather->scale = scale / 1000.0f; + feather->life = (s16)Math_Rand_ZeroFloat(20.0f) + 40; + feather->unk_2A = Math_Rand_ZeroFloat(1000.0f); + break; + } + } +} + +void EnNiw_FeatherUpdate(EnNiw* this, GlobalContext* globalCtx) { + s16 i; + EnNiwFeather* feather = this->feathers; + + for (i = 0; i < ARRAY_COUNT(this->feathers); i++, feather++) { + if (feather->type != 0) { + feather->timer++; + feather->pos.x += feather->vel.x; + feather->pos.y += feather->vel.y; + feather->pos.z += feather->vel.z; + feather->vel.x += feather->accel.x; + feather->vel.y += feather->accel.y; + feather->vel.z += feather->accel.z; + if (feather->type == 1) { + feather->unk_2A++; + Math_SmoothScaleMaxF(&feather->vel.x, 0.0f, 1.0f, 0.05f); + Math_SmoothScaleMaxF(&feather->vel.z, 0.0f, 1.0f, 0.05f); + if (feather->vel.y < -0.5f) { + feather->vel.y = -0.5f; + } + + feather->unk_30 = Math_Sins(feather->unk_2A * 0xBB8) * M_PI * 0.2f; + + if (feather->life < feather->timer) { + feather->type = 0; + } + } + } + } +} + +void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { + u8 flag = 0; + s16 i; + s32 pad; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + EnNiwFeather* feather = &this->feathers[0]; + + OPEN_DISPS(gfxCtx, "../z_en_niw.c", 1897); + + func_80093D84(globalCtx->state.gfxCtx); + + for (i = 0; i < ARRAY_COUNT(this->feathers); i++, feather++) { + if (feather->type == 1) { + if (!flag) { + gSPDisplayList(POLY_XLU_DISP++, D_060023B0); + flag++; + } + Matrix_Translate(feather->pos.x, feather->pos.y, feather->pos.z, MTXMODE_NEW); + func_800D1FD4(&globalCtx->mf_11DA0); + Matrix_Scale(feather->scale, feather->scale, 1.0f, MTXMODE_APPLY); + Matrix_RotateZ(feather->unk_30, MTXMODE_APPLY); + Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_niw.c", 1913), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06002428); + } + } + + CLOSE_DISPS(gfxCtx, "../z_en_niw.c", 1919); +} diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h index e75c7050bd..3a187e08f8 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h @@ -6,17 +6,78 @@ struct EnNiw; +typedef void (*EnNiwActionFunc)(struct EnNiw*, GlobalContext*); + +typedef struct { + /* 0x0000 */ u8 type; + /* 0x0004 */ Vec3f pos; + /* 0x0010 */ Vec3f vel; + /* 0x001C */ Vec3f accel; + /* 0x0028 */ s16 life; + /* 0x002A */ s16 unk_2A; // Variance timer? + /* 0x002C */ f32 scale; + /* 0x0030 */ f32 unk_30; + /* 0x0034 */ u8 timer; +} EnNiwFeather; // size = 0x0038 + typedef struct EnNiw { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x11E]; - /* 0x026A */ s16 unk_26A; - /* 0x026C */ char unk_26C[0x2A]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[16]; + /* 0x01F0 */ Vec3s transitionDrawTable[16]; + /* 0x0250 */ EnNiwActionFunc actionFunc; + /* 0x0254 */ s16 timer1; + /* 0x0256 */ s16 timer2; + /* 0x0258 */ s16 timer3; + /* 0x025A */ s16 timer4; + /* 0x025C */ s16 timer5; + /* 0x025E */ s16 timer6; + /* 0x0260 */ s16 sfxTimer1; + /* 0x0262 */ s16 sfxTimer2; + /* 0x0264 */ s16 sfxTimer3; + /* 0x0266 */ s16 timer7; + /* 0x0268 */ s16 timer8; + /* 0x026A */ s16 timer9; + /* 0x026C */ f32 unk_26C[10]; + /* 0x0294 */ s16 unk_294; /* 0x0296 */ s16 unk_296; - /* 0x0298 */ char unk_298[0x50]; - /* 0x02E8 */ s16 unk_2E8; - /* 0x02EA */ char unk_2EA[0x2]; + /* 0x0298 */ s16 unk_298; + /* 0x029A */ s16 unk_29A; + /* 0x029C */ s16 unk_29C; + /* 0x029E */ s16 unk_29E; + /* 0x02A0 */ s16 unk_2A0; + /* 0x02A2 */ s16 unk_2A2; + /* 0x02A4 */ s16 unk_2A4; + /* 0x02A6 */ s16 unk_2A6; + /* 0x02A8 */ s16 unk_2A8; + /* 0x02AA */ s16 unk_2AA; + /* 0x02AC */ f32 unk_2AC; + /* 0x02B0 */ f32 unk_2B0; + /* 0x02B4 */ f32 unk_2B4; + /* 0x02B8 */ f32 unk_2B8; + /* 0x02BC */ f32 unk_2BC; + /* 0x02C0 */ f32 unk_2C0; + /* 0x02C4 */ f32 unk_2C4; + /* 0x02C8 */ f32 unk_2C8; + /* 0x02CC */ f32 unk_2CC; + /* 0x02D0 */ f32 unk_2D0; + /* 0x02D4 */ f32 unk_2D4; + /* 0x02D8 */ f32 unk_2D8; + /* 0x02DC */ f32 unk_2DC; + /* 0x02E0 */ f32 unk_2E0; + /* 0x02E4 */ s16 unk_2E4; + /* 0x02E6 */ s16 unk_2E6; + /* 0x02E8 */ s16 path; + /* 0x02EA */ s16 waypoint; /* 0x02EC */ s16 unk_2EC; - /* 0x02EE */ char unk_2EE[0x4CA]; + /* 0x02EE */ s16 unk_2EE; + /* 0x02F0 */ Vec3f unk_2F0; + /* 0x02FC */ f32 unk_2FC; + /* 0x0300 */ f32 unk_300; + /* 0x0304 */ f32 unk_304; + /* 0x0308 */ u8 unk_308; + /* 0x030C */ ColliderCylinder collider; + /* 0x0358 */ EnNiwFeather feathers[20]; } EnNiw; // size = 0x07B8 extern const ActorInit En_Niw_InitVars; diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 846b433d01..f3f9eb853f 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -108,13 +108,13 @@ void func_80AB9210(EnNiwGirl* this, GlobalContext* globalCtx) { xDistBetween = this->chasedEnNiw->actor.posRot.pos.x - this->actor.posRot.pos.x; zDistBetween = this->chasedEnNiw->actor.posRot.pos.z - this->actor.posRot.pos.z; if (func_8010BDBC(&globalCtx->msgCtx) != 0) { - this->chasedEnNiw->unk_2E8 = 0; + this->chasedEnNiw->path = 0; } if (sqrtf(SQ(xDistBetween) + SQ(zDistBetween)) < 70.0f) { - this->chasedEnNiw->unk_2E8 = (this->path + 1); + this->chasedEnNiw->path = (this->path + 1); this->chasedEnNiw->unk_2EC = path->count; } else if (sqrtf(SQ(xDistBetween) + SQ(zDistBetween)) > 150.0f) { - this->chasedEnNiw->unk_2E8 = 0; + this->chasedEnNiw->path = 0; } // Change her angle so that she is always facing the cuckoo @@ -162,7 +162,7 @@ void EnNiwGirl_Talk(EnNiwGirl* this, GlobalContext* globalCtx) { void func_80AB94D0(EnNiwGirl* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (func_8010BDBC(&globalCtx->msgCtx)) { - this->chasedEnNiw->unk_2E8 = 0; + this->chasedEnNiw->path = 0; } Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 0.8f, 0.2f); if (func_8002F194(&this->actor, globalCtx)) { @@ -244,7 +244,7 @@ void EnNiwGirl_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_niw_girl.c", 573); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AB99D8[this->unk_272])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AB99D8[this->unk_272])); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnNiwGirlOverrideLimbDraw, 0, &this->actor); func_80033C30(&this->actor.posRot.pos, &sp4C, 255, globalCtx); diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 480dbbd28d..96687e3681 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -148,9 +148,9 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); Matrix_RotateZ(thisx->initPosRot.rot.z * 9.58738e-05f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 333), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 333), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists[thisx->params]); + gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337); } diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 5284ab76ac..5783d63e13 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -293,31 +293,31 @@ void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx) { func_8002EBCC(thisx, globalCtx, 0); if (thisx->params == 5) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 245, 255, 205, 30, 35, 0)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 185, 135, 25, 20, 20, 0)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 255, 255, 255, 30, 40, 20)); + gSPSegment(POLY_OPA_DISP++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 245, 255, 205, 30, 35, 0)); + gSPSegment(POLY_OPA_DISP++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 185, 135, 25, 20, 20, 0)); + gSPSegment(POLY_OPA_DISP++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 255, 255, 255, 30, 40, 20)); } else if (thisx->params == 6) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 55, 65, 55, 0, 0, 0)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 205, 165, 75, 25, 20, 0)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 205, 165, 75, 25, 20, 0)); + gSPSegment(POLY_OPA_DISP++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 55, 65, 55, 0, 0, 0)); + gSPSegment(POLY_OPA_DISP++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 205, 165, 75, 25, 20, 0)); + gSPSegment(POLY_OPA_DISP++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 205, 165, 75, 25, 20, 0)); } else if (thisx->params == 7) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 255, 255, 255, 180, 180, 180)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); + gSPSegment(POLY_OPA_DISP++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 255, 255, 255, 180, 180, 180)); + gSPSegment(POLY_OPA_DISP++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); + gSPSegment(POLY_OPA_DISP++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); } else if ((thisx->params == 9) && (this->displayList == D_06002FF0)) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001300)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001700)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06001900)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001300)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001700)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06001900)); } else if ((thisx->params == 10) && (this->displayList == D_06002FF0)) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001B00)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001F00)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06002100)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001B00)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001F00)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06002100)); } if (this->displayList != NULL) { - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_part.c", 696), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_part.c", 696), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, this->displayList); + gSPDisplayList(POLY_OPA_DISP++, this->displayList); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_part.c", 700); diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index bf40c59e65..50d764d733 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -868,11 +868,11 @@ void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_314 == 0xFF) { func_80093D18(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, this->unk_314); - gSPSegment(oGfxCtx->polyOpa.p++, 8, &D_80116280[2]); - oGfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->unk_314); + gSPSegment(POLY_OPA_DISP++, 8, &D_80116280[2]); + POLY_OPA_DISP = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnRd_OverrideLimbDraw, EnRd_PostLimbDraw, - &this->actor, oGfxCtx->polyOpa.p); + &this->actor, POLY_OPA_DISP); func_80033C30(&thisPos, &D_80AE4958, 255, globalCtx); if (this->unk_31A != 0) { this->actor.dmgEffectTimer++; @@ -884,11 +884,11 @@ void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx) { } } else { func_80093D84(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->unk_314); - gSPSegment(oGfxCtx->polyXlu.p++, 8, &D_80116280[0]); - oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_314); + gSPSegment(POLY_XLU_DISP++, 8, &D_80116280[0]); + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnRd_OverrideLimbDraw, NULL, &this->actor, - oGfxCtx->polyXlu.p); + POLY_XLU_DISP); func_80033C30(&thisPos, &D_80AE4958, this->unk_314, globalCtx); } diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 9d34370265..1b0792c913 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -635,9 +635,9 @@ void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); if (this->isBig) { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 155, 55, 255, 255); + gDPSetPrimColor(POLY_OPA_DISP++, 0x0, 0x01, 155, 55, 255, 255); } else { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 255, 255, 255, 255); + gDPSetPrimColor(POLY_OPA_DISP++, 0x0, 0x01, 255, 255, 255, 255); } SkelAnime_Draw(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index f72590aabb..1c1d105c45 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -311,13 +311,13 @@ void func_80AE7D94(EnRl* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, D_80116280); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha); + gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280); - oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, - skelAnime->dListCount, NULL, NULL, NULL, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rl_inKenjyanomaDemo02.c", 331); } @@ -360,10 +360,10 @@ void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 676d93c4d9..75b28e63ba 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -2360,15 +2360,15 @@ void func_80AF0400(EnRu1* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); - oGfxCtx->polyOpa.p = + POLY_OPA_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, - EnRu1_OverrideLimbDraw, EnRu1_PostLimbDraw, &this->actor, oGfxCtx->polyOpa.p); + EnRu1_OverrideLimbDraw, EnRu1_PostLimbDraw, &this->actor, POLY_OPA_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ru1.c", 1309); } @@ -2386,15 +2386,15 @@ void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->unk_2A8); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_2A8); + gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]); - oGfxCtx->polyXlu.p = + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, - EnRu1_OverrideLimbDraw, NULL, &this->actor, oGfxCtx->polyXlu.p); + EnRu1_OverrideLimbDraw, NULL, &this->actor, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ru1.c", 1353); } diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index d92fbb4799..d4a3dfdff4 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -480,13 +480,13 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha); + gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]); - oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, - skelAnime->dListCount, NULL, NULL, NULL, oGfxCtx->polyXlu.p); + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); } @@ -805,10 +805,10 @@ void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 48b1f362d9..f0b6da1a4f 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -62,7 +62,7 @@ void EnSceneChange_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290); displayListHead = displayList; - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, displayListHead); + gSPSegment(POLY_OPA_DISP++, 0x0C, displayListHead); func_80093D18(globalCtx->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index e83fa7527d..90e8fb8b2b 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -94,9 +94,9 @@ void EnSkjneedle_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_skj_needle.c", 200); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_skj_needle.c", 205), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_skj_needle.c", 205), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_06000EB0); + gSPDisplayList(POLY_OPA_DISP++, &D_06000EB0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_skj_needle.c", 210); } diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 2356f10ec7..b6b61feb9e 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -1026,8 +1026,8 @@ s32 EnSt_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dListP, break; case 4: // teeth - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, this->teethR, this->teethG, this->teethB, 0); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, this->teethR, this->teethG, this->teethB, 0); break; } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_st.c", 2295); diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 4768bfb045..b49dd2dcdd 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -765,7 +765,7 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { for (i = 0; i < 5; i++, ptr++) { if (ptr->unk_00 == 1) { if (flag == 0) { - gSPDisplayList(oGfxCtx->polyXlu.p++, D_060023B0); + gSPDisplayList(POLY_XLU_DISP++, D_060023B0); flag++; } @@ -775,9 +775,9 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { Matrix_RotateZ(ptr->unk_30, MTXMODE_APPLY); Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_en_syateki_niw.c", 1251), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_syateki_niw.c", 1251), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06002428); + gSPDisplayList(POLY_XLU_DISP++, D_06002428); } } diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 552133f83b..990394db35 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -226,7 +226,7 @@ void EnTakaraMan_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_takara_man.c", 528); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTakaraEyeTextures[this->eyeTextureIdx])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTakaraEyeTextures[this->eyeTextureIdx])); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, EnTakaraMan_OverrideLimbDraw, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index c10f1f7752..aef58d5b72 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -72,9 +72,9 @@ void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 148); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists1[thisx->params]); + gSPDisplayList(POLY_OPA_DISP++, sDLists1[thisx->params]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 157); } @@ -85,10 +85,10 @@ void func_80B1809C(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 163); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sUnkSegments[thisx->params])); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169), + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sUnkSegments[thisx->params])); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists1[thisx->params]); + gSPDisplayList(POLY_OPA_DISP++, sDLists1[thisx->params]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 174); } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 89428b04dd..83c131e658 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -117,26 +117,26 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(this->eff); i++) { if (eff->active != 0) { if (gfxSetup == 0) { - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0600BC90); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 100, 60, 20, 0); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); + gSPDisplayList(POLY_XLU_DISP++, D_0600BC90); + gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); gfxSetup = 1; } alpha = eff->timeLeft * (255.f / eff->timeTotal); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 170, 130, 90, alpha); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 130, 90, alpha); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); func_800D1FD4(&globalCtx->mf_11DA0); Matrix_Scale(eff->size, eff->size, 1.f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 140), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 140), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); imageIdx = eff->timeLeft * ((f32)ARRAY_COUNT(images) / eff->timeTotal); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(images[imageIdx])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(images[imageIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0600BCA0); + gSPDisplayList(POLY_XLU_DISP++, D_0600BCA0); } eff++; } @@ -683,7 +683,7 @@ void EnTk_Update(Actor* thisx, GlobalContext* globalCtx) { void func_80B1D200(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_0600ACE0); + gSPDisplayList(POLY_OPA_DISP++, D_0600ACE0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tk.c", 1190); } @@ -739,7 +739,7 @@ void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeImageIdx])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeImageIdx])); SkelAnime_DrawSV(globalCtx, this->skelAnim.skeleton, this->skelAnim.limbDrawTbl, this->skelAnim.dListCount, EnTk_OverrideLimbDraw, EnTk_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index a8a164bae3..ee88735ce8 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -561,7 +561,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386); func_80094044(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, 255); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); func_80038A28(this->actor.floorPoly, this->actor.posRot.pos.x, this->actor.groundY, this->actor.posRot.pos.z, &mf); Matrix_Mult(&mf, MTXMODE_NEW); @@ -574,8 +574,8 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { } Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1421), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_04049210); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1421), G_MTX_LOAD); + gSPDisplayList(POLY_XLU_DISP++, &D_04049210); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426); } @@ -605,8 +605,8 @@ void EnWallMas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList Matrix_RotateZ(DEGREE_15_RAD, MTXMODE_APPLY); Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06008688); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, D_06008688); Matrix_Pull(); diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 670ef8c9aa..2cb37c5e49 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -139,10 +139,10 @@ void EnYukabyun_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 366); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B43F64[this->unk_152])); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 373), + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B43F64[this->unk_152])); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 373), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000970); + gSPDisplayList(POLY_OPA_DISP++, D_06000970); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 378); } diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 23326aaddb..3f1a74974b 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -38,7 +38,7 @@ const ActorInit En_Zl1_InitVars = { (ActorFunc)EnZl1_Draw, }; -ColliderCylinderInit sCylinderInit = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_UNK0, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, { 0x01, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, { 20, 46, 0, { 0, 0, 0 } }, @@ -121,12 +121,7 @@ void func_80B4AE18(EnZl1* this) { if (DECR(this->unk_1FC) == 0) { this->unk_1FC = Math_Rand_S16Offset(0x1E, 0xA); } - - if (this->unk_1FC < 4) { - this->unk_1FE = this->unk_1FC; - } else { - this->unk_1FE = 0; - } + this->unk_1FE = (this->unk_1FC < 4) ? this->unk_1FC : 0; this->unk_1F4 = D_80B4E61C[this->unk_1FE]; this->unk_1F8 = D_80B4E61C[this->unk_1FE]; @@ -141,17 +136,13 @@ void func_80B4AF18(EnZl1* this, GlobalContext* globalCtx) { func_80038290(globalCtx, &this->actor, &this->unk_200, &this->unk_206, this->actor.posRot2.pos); if (this->unk_1E6 != 0) { - if (func_8002F334(this, globalCtx) != 0) { + if (func_8002F334(&this->actor, globalCtx)) { this->unk_1E6 = 0; } - } else { - if (func_8002F194(this, globalCtx)) { - this->unk_1E6 = 1; - } else { - if (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) { - func_8002F2F4(this, globalCtx); - } - } + } else if (func_8002F194(&this->actor, globalCtx)) { + this->unk_1E6 = 1; + } else if (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) { + func_8002F2F4(&this->actor, globalCtx); } Collider_CylinderUpdate(&this->actor, &this->collider); @@ -193,10 +184,8 @@ void func_80B4B010(EnZl1* this, GlobalContext* globalCtx) { } else { if (1) {}; // necessary to match rotDiff = ABS(this->actor.yawTowardsLink - this->actor.shape.rot.y); - if (rotDiff < 0x238E) { - if (!(player->actor.posRot.pos.y < this->actor.posRot.pos.y)) { - func_8002F2F4(this, globalCtx); - } + if ((rotDiff < 0x238E) && !(player->actor.posRot.pos.y < this->actor.posRot.pos.y)) { + func_8002F2F4(&this->actor, globalCtx); } } } @@ -230,7 +219,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { sp3C = 1; this->actor.textId = 0x702E; func_8010B680(globalCtx, this->actor.textId, NULL); - this->unk_1E2 += 1; + this->unk_1E2++; break; } break; @@ -242,7 +231,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { player->actor.posRot.pos = sp58; this->actor.textId = 0x702F; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 += 1; + this->unk_1E2++; } break; case 2: @@ -250,7 +239,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { if (msgCtx->choiceIndex == 0) { animationHeader = &D_06013F10; sp3C = 2; - this->unk_1E2 += 1; + this->unk_1E2++; } else { animationHeader = &D_060116E4; sp3C = 2; @@ -265,7 +254,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { sp3C = 1; this->actor.textId = 0x7032; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 += 1; + this->unk_1E2++; } break; case 4: @@ -277,7 +266,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { } else { this->actor.textId = 0x7034; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 += 1; + this->unk_1E2++; } } break; @@ -285,7 +274,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { if ((func_8010BDBC(msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { this->actor.textId = 0x7033; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 -= 1; + this->unk_1E2--; } break; case 6: @@ -295,14 +284,14 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { sp3C = 1; this->actor.textId = 0x7031; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 += 1; + this->unk_1E2++; } break; case 7: if ((func_8010BDBC(msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { this->actor.textId = 0x7030; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 += 1; + this->unk_1E2++; } break; case 8: @@ -314,7 +303,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { } else { this->actor.textId = 0x7031; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 -= 1; + this->unk_1E2--; } } break; @@ -326,7 +315,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { globalCtx->csCtx.segment = D_80B4C5D0; gSaveContext.cutsceneTrigger = 1; this->actionFunc = func_80B4B8B4; - this->unk_1E2 += 1; + this->unk_1E2++; } break; } @@ -443,13 +432,10 @@ void func_80B4BC78(EnZl1* this, GlobalContext* globalCtx) { CsCmdActorAction* npcAction; s32 pad; f32 frameCount; - Vec3f sp40; - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { - if (this->skelAnime.animCurrentSeg == &D_06010B38) { - frameCount = SkelAnime_GetFrameCount(&D_06011348.genericHeader); - SkelAnime_ChangeAnim(&this->skelAnime, &D_06011348, 1.0f, 0.0f, frameCount, 0, -10.0f); - } + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) && (this->skelAnime.animCurrentSeg == &D_06010B38)) { + frameCount = SkelAnime_GetFrameCount(&D_06011348.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06011348, 1.0f, 0.0f, frameCount, 0, -10.0f); } func_80B4B874(this, globalCtx); npcAction = globalCtx->csCtx.npcActions[0]; @@ -457,9 +443,7 @@ void func_80B4BC78(EnZl1* this, GlobalContext* globalCtx) { func_80B4B7F4(npcAction, &sp70); func_80B4B834(npcAction, &sp64); if (this->unk_1E6 == 0) { - sp40 = sp70; - this->actor.initPosRot.pos = sp40; - this->actor.posRot.pos = sp40; + this->actor.posRot.pos = this->actor.initPosRot.pos = sp70; } if (this->unk_1E6 != npcAction->action) { @@ -493,7 +477,7 @@ void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) { if (msgCtx->choiceIndex == 0) { this->actor.textId = 0x703B; func_8010B720(globalCtx, this->actor.textId); - this->unk_1E2 += 1; + this->unk_1E2++; } else { this->actor.textId = 0x703A; func_8010B720(globalCtx, this->actor.textId); @@ -508,19 +492,19 @@ void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) { func_8002F434(&this->actor, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f); globalCtx->msgCtx.msgMode = 0x36; globalCtx->msgCtx.unk_E3E7 = 4; - this->unk_1E2 += 1; + this->unk_1E2++; } else { break; } case 2: - if (Actor_HasParent(this, globalCtx)) { + if (Actor_HasParent(&this->actor, globalCtx)) { func_800C078C(globalCtx, 0, this->unk_1E8); Gameplay_ChangeCameraStatus(globalCtx, 0, 7); Gameplay_ClearCamera(globalCtx, this->unk_1E8); this->actor.parent = NULL; - this->unk_1E2 += 1; + this->unk_1E2++; } else { - func_8002F434(this, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f); + func_8002F434(&this->actor, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f); } break; case 3: @@ -535,20 +519,20 @@ void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) { if (player->actor.posRot.pos.y < this->actor.posRot.pos.y) { break; } else { - if (func_8002F194(this, globalCtx) != 0) { - this->unk_1E2 += 1; + if (func_8002F194(&this->actor, globalCtx)) { + this->unk_1E2++; } else { - func_8002F2F4(this, globalCtx); + func_8002F2F4(&this->actor, globalCtx); } } break; case 5: - if (func_8002F334(this, globalCtx) != 0) { - this->unk_1E2 -= 1; + if (func_8002F334(&this->actor, globalCtx)) { + this->unk_1E2--; } break; case 6: - if (func_8002F334(this, globalCtx) != 0) { + if (func_8002F334(&this->actor, globalCtx)) { func_8002DF54(globalCtx, &this->actor, 7); Interface_ChangeAlpha(50); this->actor.flags &= ~0x100; @@ -612,9 +596,9 @@ void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_girlB.c", 2011); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(this->unk_1F4)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(this->unk_1F8)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(this->unk_1EC)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(this->unk_1F4)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(this->unk_1F8)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(this->unk_1EC)); func_80093D18(globalCtx->state.gfxCtx); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index b3d59cd962..af34297b90 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -1688,15 +1688,15 @@ void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp74)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp74)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0B, &D_80116280[2]); - oGfxCtx->polyOpa.p = + POLY_OPA_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, - EnZl2_OverrideLimbDraw, EnZl2_PostLimbDraw, &this->actor, oGfxCtx->polyOpa.p); + EnZl2_OverrideLimbDraw, EnZl2_PostLimbDraw, &this->actor, POLY_OPA_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1648); } @@ -1714,15 +1714,15 @@ void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0B, &D_80116280[0]); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_XLU_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha); + gSPSegment(POLY_XLU_DISP++, 0x0B, &D_80116280[0]); - oGfxCtx->polyXlu.p = + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, - EnZl2_OverrideLimbDraw, NULL, &this->actor, oGfxCtx->polyXlu.p); + EnZl2_OverrideLimbDraw, NULL, &this->actor, POLY_XLU_DISP); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1692); } diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index a65a95c6ef..1b7979ac76 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -65,8 +65,8 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(0.287621408700943f, MTXMODE_APPLY); Matrix_RotateY(0.0f, MTXMODE_APPLY); Matrix_RotateZ(0.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_end_title.c", 412), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTriforceDList); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_end_title.c", 412), G_MTX_LOAD); + gSPDisplayList(POLY_XLU_DISP++, sTriforceDList); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 417); @@ -83,51 +83,51 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { this->ootAlpha += 15; } - oGfxCtx->overlay.p = func_80093F34(oGfxCtx->overlay.p); - gDPSetTextureLUT(oGfxCtx->overlay.p++, G_TT_NONE); - gDPSetEnvColor(oGfxCtx->overlay.p++, 255, 120, 30, 0); - gDPSetRenderMode(oGfxCtx->overlay.p++, G_RM_PASS, G_RM_XLU_SURF2); - gSPClearGeometryMode(oGfxCtx->overlay.p++, + OVERLAY_DISP = func_80093F34(OVERLAY_DISP); + gDPSetTextureLUT(OVERLAY_DISP++, G_TT_NONE); + gDPSetEnvColor(OVERLAY_DISP++, 255, 120, 30, 0); + gDPSetRenderMode(OVERLAY_DISP++, G_RM_PASS, G_RM_XLU_SURF2); + gSPClearGeometryMode(OVERLAY_DISP++, G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); - gDPSetCombineLERP(oGfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0x00, 0x80, 0, 0, 0, this->endAlpha); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 80, D_80B670E0); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 11, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, + gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->endAlpha); + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 80, D_80B670E0); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 11, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadTile(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, (80 << 2), (24 << 2)); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 11, 0x0, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadTile(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, (80 << 2), (24 << 2)); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 11, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, (80 << 2), (24 << 2)); - gSPTextureRectangle(oGfxCtx->overlay.p++, (120 << 2), (90 << 2), (200 << 2), (113 << 2), G_TX_RENDERTILE, 0, 0, + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, (80 << 2), (24 << 2)); + gSPTextureRectangle(OVERLAY_DISP++, (120 << 2), (90 << 2), (200 << 2), (113 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 120, D_80B65EA0); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha); + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 120, D_80B65EA0); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadTile(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, (120 << 2), (24 << 2)); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadTile(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, (120 << 2), (24 << 2)); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, (120 << 2), (24 << 2)); - gSPTextureRectangle(oGfxCtx->overlay.p++, (100 << 2), (160 << 2), (220 << 2), (183 << 2), G_TX_RENDERTILE, 0, 0, + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, (120 << 2), (24 << 2)); + gSPTextureRectangle(OVERLAY_DISP++, (100 << 2), (160 << 2), (220 << 2), (183 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0x00, 0x80, 0, 0, 0, this->ootAlpha); - gDPSetTextureImage(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 112, D_80B669E0); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 15, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->ootAlpha); + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 112, D_80B669E0); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 15, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0); - gDPLoadSync(oGfxCtx->overlay.p++); - gDPLoadTile(oGfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, (112 << 2), (16 << 2)); - gDPPipeSync(oGfxCtx->overlay.p++); - gDPSetTile(oGfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 15, 0x0, G_TX_RENDERTILE, 0, + gDPLoadSync(OVERLAY_DISP++); + gDPLoadTile(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, (112 << 2), (16 << 2)); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 15, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0); - gDPSetTileSize(oGfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, (112 << 2), (16 << 2)); - gSPTextureRectangle(oGfxCtx->overlay.p++, (104 << 2), (177 << 2), (216 << 2), (192 << 2), G_TX_RENDERTILE, 0, 0, + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, (112 << 2), (16 << 2)); + gSPTextureRectangle(OVERLAY_DISP++, (104 << 2), (177 << 2), (216 << 2), (192 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 515); @@ -148,9 +148,9 @@ void func_80B65DA8(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 594); - oGfxCtx->overlay.p = func_80093F34(oGfxCtx->overlay.p); - gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0x80, 0, 0, 0, this->endAlpha); - gSPDisplayList(oGfxCtx->overlay.p++, dList_80B69720); + OVERLAY_DISP = func_80093F34(OVERLAY_DISP); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0x80, 0, 0, 0, this->endAlpha); + gSPDisplayList(OVERLAY_DISP++, dList_80B69720); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 600); } diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index 2c8f807c80..abec30a5ea 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -99,16 +99,16 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx) { if (flag) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 551), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 551), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06001290); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06001470); + gSPDisplayList(POLY_XLU_DISP++, D_06001290); + gSPDisplayList(POLY_XLU_DISP++, D_06001470); } else { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 557), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 557), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001290); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001470); + gSPDisplayList(POLY_OPA_DISP++, D_06001290); + gSPDisplayList(POLY_OPA_DISP++, D_06001470); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 561); diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 32ae0ea2da..c2c4fc3cdf 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -229,14 +229,14 @@ s32 MagicWind_OverrideLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCur OPEN_DISPS(globalCtx->state.gfxCtx, "../z_magic_wind.c", 615); if (limbIndex == 1) { - gSPSegment(oGfxCtx->polyXlu.p++, 8, + gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->state.frames * 9) & 0xFF, 0xFF - ((globalCtx->state.frames * 0xF) & 0xFF), 0x40, 0x40, 1, (globalCtx->state.frames * 0xF) & 0xFF, 0xFF - ((globalCtx->state.frames * 0x1E) & 0xFF), 0x40, 0x40)); } else if (limbIndex == 2) { - gSPSegment(oGfxCtx->polyXlu.p++, 9, + gSPSegment(POLY_XLU_DISP++, 9, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->state.frames * 3) & 0xFF, 0xFF - ((globalCtx->state.frames * 5) & 0xFF), 0x40, 0x40, 1, (globalCtx->state.frames * 6) & 0xFF, @@ -255,7 +255,7 @@ void MagicWind_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(gfxCtx, "../z_magic_wind.c", 661); if (this->actionFunc != MagicWind_WaitForTimer) { - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 25); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 25); SkelCurve_Draw(thisx, globalCtx, &this->skelCurve, MagicWind_OverrideLimbDraw, NULL, 1, NULL); } diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 9ac31ed073..3ebbb5d9e8 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -5,6 +5,7 @@ */ #include "z_obj_blockstop.h" +#include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #define FLAGS 0x00000000 @@ -50,8 +51,9 @@ void ObjBlockstop_Update(Actor* thisx, GlobalContext* globalCtx) { &this->actor.floorPoly, 0, 0, 1, 1, &sp48, &this->actor)) { dynaActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, sp48); - if ((dynaActor != NULL) && (dynaActor->actor.id == 0xFF)) { - if (((dynaActor->actor.params & 0x000F) == 3) || ((dynaActor->actor.params & 0x000F) == 7)) { + if ((dynaActor != NULL) && (dynaActor->actor.id == ACTOR_OBJ_OSHIHIKI)) { + if (((dynaActor->actor.params & 0xF) == PUSHBLOCK_HUGE_START_ON) || + ((dynaActor->actor.params & 0xF) == PUSHBLOCK_HUGE_START_OFF)) { func_80078884(NA_SE_SY_CORRECT_CHIME); } else { func_80078884(NA_SE_SY_TRE_BOX_APPEAR); diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index e07a96fb43..4a4a758bb3 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -203,10 +203,10 @@ void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0, -(this->actor.scale.y * 118.0f), 0, 1); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_comb.c", 394), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_comb.c", 394), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_050095B0); + gSPDisplayList(POLY_OPA_DISP++, D_050095B0); func_800628A4(0, &this->collider); diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 9cde524913..8f54370d02 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -152,17 +152,17 @@ void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 379), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 379), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_060030D0); + gSPDisplayList(POLY_OPA_DISP++, D_060030D0); frameCount = globalCtx->state.frames; gSPSegment( - oGfxCtx->polyXlu.p++, 0x08, + POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frameCount % 128, 0, 32, 32, 1, frameCount % 128, 0, 32, 32)); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 399), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 399), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_060032D8); + gSPDisplayList(POLY_XLU_DISP++, D_060032D8); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 409); } diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index ac6411614f..b92ae1d210 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -153,7 +153,7 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 369), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 369), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (globalCtx->sceneNum == SCENE_HIDAN) { @@ -165,8 +165,8 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) { color = &defaultColor; } - gDPSetEnvColor(oGfxCtx->polyOpa.p++, color->r, color->g, color->b, 255); - gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists[thisx->params & 3]); + gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 255); + gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params & 3]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 399); } diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 4ac979e121..f216970f8f 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -6,6 +6,7 @@ #include "z_obj_lightswitch.h" #include "vt.h" +#include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #define FLAGS 0x00000010 @@ -176,10 +177,11 @@ void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.posRot.rot.x = this->actor.initPosRot.rot.x = this->actor.shape.rot.x; this->actor.posRot.rot.z = this->actor.initPosRot.rot.z = this->actor.shape.rot.z; this->actor.flags |= 0x20; - if (!Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_OBJ_OSHIHIKI, - this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, - this->actor.initPosRot.pos.z, 0, this->actor.initPosRot.rot.y, 0, 0xFF00)) { + if (Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_OBJ_OSHIHIKI, + this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, + 0, this->actor.initPosRot.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) { osSyncPrintf(VT_COL(RED, WHITE)); + // Push-pull block occurrence failure osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452, this->actor.params); osSyncPrintf(VT_RST); @@ -191,11 +193,15 @@ void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) { if (removeSelf) { Actor_Kill(&this->actor); } + // Light switch osSyncPrintf("(光スイッチ)(arg_data 0x%04x)\n", this->actor.params); } void ObjLightswitch_Destroy(Actor* thisx, GlobalContext* globalCtx) { - Collider_DestroyJntSph(globalCtx, &THIS->collider); + GlobalContext* globalCtx2 = globalCtx; + ObjLightswitch* this = THIS; + + Collider_DestroyJntSph(globalCtx2, &this->collider); } void ObjLightswitch_SetupOff(ObjLightswitch* this) { @@ -387,9 +393,9 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 809); func_80093D18(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), + gDPSetEnvColor(POLY_OPA_DISP++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), (u8)(this->color[2] >> 6), (u8)(this->alpha >> 6)); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, &D_80116280[2]); + gSPSegment(POLY_OPA_DISP++, 0x09, &D_80116280[2]); if ((this->actor.params & 1) == 1) { child = this->actor.child; @@ -405,26 +411,26 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { pos.z = this->actor.posRot.pos.z; } - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 841), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 841), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(faceTextures[this->faceTextureIndex])); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000260); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(faceTextures[this->faceTextureIndex])); + gSPDisplayList(POLY_OPA_DISP++, D_06000260); rot.x = this->actor.shape.rot.x; rot.y = this->actor.shape.rot.y; rot.z = this->actor.shape.rot.z + this->flameRingRot; func_800D1694(pos.x, pos.y, pos.z, &rot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 859), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 859), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000398); + gSPDisplayList(POLY_OPA_DISP++, D_06000398); rot.z = this->actor.shape.rot.z - this->flameRingRot; func_800D1694(pos.x, pos.y, pos.z, &rot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 873), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 873), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000408); + gSPDisplayList(POLY_OPA_DISP++, D_06000408); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 878); } @@ -437,18 +443,18 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 890); func_80093D84(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), + gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), (u8)(this->color[2] >> 6), (u8)(this->alpha >> 6)); - gSPSegment(oGfxCtx->polyXlu.p++, 0x09, D_80116280); + gSPSegment(POLY_XLU_DISP++, 0x09, D_80116280); sp68.x = this->actor.posRot.pos.x; sp68.y = this->actor.posRot.pos.y + (this->actor.shape.unk_08 * this->actor.scale.y); sp68.z = this->actor.posRot.pos.z; - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 912), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 912), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(faceTextures[this->faceTextureIndex])); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000260); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(faceTextures[this->faceTextureIndex])); + gSPDisplayList(POLY_XLU_DISP++, D_06000260); sp60.x = this->actor.shape.rot.x; sp60.y = this->actor.shape.rot.y; @@ -456,16 +462,16 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { func_800D1694(sp68.x, sp68.y, sp68.z, &sp60); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 930), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 930), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000398); + gSPDisplayList(POLY_XLU_DISP++, D_06000398); sp60.z = this->actor.shape.rot.z - this->flameRingRot; func_800D1694(sp68.x, sp68.y, sp68.z, &sp60); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 944), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 944), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000408); + gSPDisplayList(POLY_XLU_DISP++, D_06000408); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 949); } diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 796601ba1d..3d884045f7 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -1,14 +1,12 @@ /* * File: z_obj_makeoshihiki.c * Overlay: ovl_Obj_Makeoshihiki - * Description: Push Block (Hardcoded) + * Description: Push Block puzzle (Hardcoded) */ #include "z_obj_makeoshihiki.h" - -#include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" - #include "vt.h" +#include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #define FLAGS 0x00000020 @@ -26,8 +24,8 @@ const ActorInit Obj_Makeoshihiki_InitVars = { typedef struct { /* 0x00 */ Vec3f posVecs[3]; /* 0x24 */ u8 unk_24[3]; - /* 0x27 */ u8 paramVal1; - /* 0x28 */ u8 paramVal2; + /* 0x27 */ u8 color; + /* 0x28 */ u8 type; /* 0x2A */ s16 rotY; } BlockConfig; // size = 0x2C @@ -37,14 +35,14 @@ static BlockConfig sBlocks[] = { 0x00, 0x03, 0xFF, - 0x02, + PUSHBLOCK_LARGE_START_ON, 0x0000 }, { { { -605.0f, -820.0f, -290.0f }, { -365.0f, -905.0f, -290.0f }, { -365.0f, -905.0f, -290.0f } }, 0x00, 0x03, 0x00, 0xFF, - 0x00, + PUSHBLOCK_SMALL_START_ON, 0x0000 } }; @@ -69,7 +67,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) { if (Actor_SpawnAsChild(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0, block->rotY, 0, - ((block->paramVal1 << 6) & 0xC0) | (block->paramVal2 & 0xF) | 0xFF00) == NULL) { + ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) { // Push-pull block failure osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194); @@ -78,7 +76,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) { return; } if (block->unk_24[typeIdx] & 2) { - ((ObjOshihiki*)thisx->child)->unk_1BE = 1; + ((ObjOshihiki*)thisx->child)->cantMove = true; } thisx->posRot.rot.z = thisx->shape.rot.z = 0; osSyncPrintf("(%s)(arg_data %04xF)(angleZ %d)\n", "../z_obj_makeoshihiki.c", thisx->params, @@ -127,7 +125,7 @@ void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { sFlagSwitchFuncs[sFlags[i][1]](globalCtx, (thisx->params >> 8) & 0x3F); if (block->unk_24[i] & 2) { - ((ObjOshihiki*)thisx->child)->unk_1BE = 1; + ((ObjOshihiki*)thisx->child)->cantMove = true; } break; diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index b2e53ef817..6d75456ed9 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -1,10 +1,11 @@ /* * File: z_obj_oshihiki.c * Overlay: ovl_Obj_Oshihiki - * Description: Movable Block + * Description: Push Block */ #include "z_obj_oshihiki.h" +#include "overlays/actors/ovl_Obj_Switch/z_obj_switch.h" #define FLAGS 0x00000010 @@ -15,7 +16,21 @@ void ObjOshihiki_Destroy(Actor* thisx, GlobalContext* globalCtx); void ObjOshihiki_Update(Actor* thisx, GlobalContext* globalCtx); void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void ObjOshihiki_SetupOnScene(ObjOshihiki* this, GlobalContext* globalCtx); +void ObjOshihiki_OnScene(ObjOshihiki* this, GlobalContext* globalCtx); +void ObjOshihiki_SetupOnActor(ObjOshihiki* this, GlobalContext* globalCtx); +void ObjOshihiki_OnActor(ObjOshihiki* this, GlobalContext* globalCtx); +void ObjOshihiki_SetupPush(ObjOshihiki* this, GlobalContext* globalCtx); +void ObjOshihiki_Push(ObjOshihiki* this, GlobalContext* globalCtx); +void ObjOshihiki_SetupFall(ObjOshihiki* this, GlobalContext* globalCtx); +void ObjOshihiki_Fall(ObjOshihiki* this, GlobalContext* globalCtx); + +extern ColHeader D_05004E98; +extern UNK_TYPE D_05003350; +extern UNK_TYPE D_05003B50; +extern UNK_TYPE D_05004350; +extern Gfx D_05004CD0[]; + const ActorInit Obj_Oshihiki_InitVars = { ACTOR_OBJ_OSHIHIKI, ACTORTYPE_PROP, @@ -27,63 +42,654 @@ const ActorInit Obj_Oshihiki_InitVars = { (ActorFunc)ObjOshihiki_Update, (ActorFunc)ObjOshihiki_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s") +f32 sScales[] = { + (1 / 10.0f), (1 / 6.0f), (1 / 5.0f), (1 / 3.0f), (1 / 10.0f), (1 / 6.0f), (1 / 5.0f), (1 / 3.0f), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s") +Color_RGB8 sColors[][4] = { + { { 110, 86, 40 }, { 110, 86, 40 }, { 110, 86, 40 }, { 110, 86, 40 } }, // deku tree + { { 106, 120, 110 }, { 104, 80, 20 }, { 0, 0, 0 }, { 0, 0, 0 } }, // dodongos cavern + { { 142, 99, 86 }, { 72, 118, 96 }, { 0, 0, 0 }, { 0, 0, 0 } }, // forest temple + { { 210, 150, 80 }, { 210, 170, 80 }, { 0, 0, 0 }, { 0, 0, 0 } }, // fire temple + { { 102, 144, 182 }, { 176, 167, 100 }, { 100, 167, 100 }, { 117, 97, 96 } }, // water temple + { { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 } }, // spirit temple + { { 135, 125, 95 }, { 135, 125, 95 }, { 135, 125, 95 }, { 135, 125, 95 } }, // shadow temple + { { 255, 255, 255 }, { 255, 255, 255 }, { 255, 255, 255 }, { 255, 255, 255 } }, // ganons castle + { { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 } }, // gerudo training grounds +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s") +s16 sScenes[] = { + SCENE_YDAN, SCENE_DDAN, SCENE_BMORI1, SCENE_HIDAN, SCENE_MIZUSIN, + SCENE_JYASINZOU, SCENE_HAKADAN, SCENE_GANON, SCENE_MEN, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s") +// The vertices and center of the bottom face +Vec3f sColCheckPoints[5] = { + { 29.99f, 1.01f, -29.99f }, { -29.99f, 1.01f, -29.99f }, { -29.99f, 1.01f, 29.99f }, + { 29.99f, 1.01f, 29.99f }, { 0.0f, 1.01f, 0.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s") +Vec2f sFaceVtx[] = { + { -30.0f, 0.0f }, + { 30.0f, 0.0f }, + { -30.0f, 60.0f }, + { 30.0f, 60.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s") +Vec2f sFaceDirection[] = { + { 1.0f, 1.0f }, + { -1.0f, 1.0f }, + { 1.0f, -1.0f }, + { -1.0f, -1.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s") +void ObjOshihiki_InitDynapoly(ObjOshihiki* this, GlobalContext* globalCtx, ColHeader* collision, + DynaPolyMoveFlag moveFlag) { + s32 pad; + ColHeader* colHeader = NULL; + s32 pad2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s") + DynaPolyInfo_SetActorMove(&this->dyna, moveFlag); + DynaPolyInfo_Alloc(collision, &colHeader); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s") + if (this->dyna.dynaPolyId == 50) { + // Warning : move BG registration failure + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 280, + this->dyna.actor.id, this->dyna.actor.params); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s") +void ObjOshihiki_RotateXZ(Vec3f* out, Vec3f* in, f32 sn, f32 cs) { + out->x = (in->z * sn) + (in->x * cs); + out->y = in->y; + out->z = (in->z * cs) - (in->x * sn); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s") +s32 ObjOshihiki_StrongEnough(ObjOshihiki* this) { + s32 strength; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s") + if (this->cantMove) { + return 0; + } + strength = Player_GetStrength(); + switch (this->dyna.actor.params & 0xF) { + case PUSHBLOCK_SMALL_START_ON: + case PUSHBLOCK_MEDIUM_START_ON: + case PUSHBLOCK_SMALL_START_OFF: + case PUSHBLOCK_MEDIUM_START_OFF: + return 1; + break; + case PUSHBLOCK_LARGE_START_ON: + case PUSHBLOCK_LARGE_START_OFF: + return strength >= PLAYER_STR_BRACELET; + break; + case PUSHBLOCK_HUGE_START_ON: + case PUSHBLOCK_HUGE_START_OFF: + return strength >= PLAYER_STR_SILVER_G; + break; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s") +void ObjOshihiki_ResetFloors(ObjOshihiki* this) { + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s") + for (i = 0; i < ARRAY_COUNT(this->floorBgIds); i++) { + this->floorBgIds[i] = 50; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s") +ObjOshihiki* ObjOshihiki_GetBlockUnder(ObjOshihiki* this, GlobalContext* globalCtx) { + DynaPolyActor* dyna; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s") + if ((this->floorBgIds[this->highestFloor] != 50) && + (fabsf(this->dyna.actor.groundY - this->dyna.actor.posRot.pos.y) < 0.001f)) { + dyna = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->floorBgIds[this->highestFloor]); + if ((dyna != NULL) && (dyna->actor.id == ACTOR_OBJ_OSHIHIKI)) { + return (ObjOshihiki*)dyna; + } + } + return NULL; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s") +void ObjOshihiki_UpdateInitPos(ObjOshihiki* this) { + if (this->dyna.actor.initPosRot.pos.x < this->dyna.actor.posRot.pos.x) { + while ((this->dyna.actor.posRot.pos.x - this->dyna.actor.initPosRot.pos.x) >= 20.0f) { + this->dyna.actor.initPosRot.pos.x += 20.0f; + } + } else { + while ((this->dyna.actor.initPosRot.pos.x - this->dyna.actor.posRot.pos.x) >= 20.0f) { + this->dyna.actor.initPosRot.pos.x -= 20.0f; + } + } + if (this->dyna.actor.initPosRot.pos.z < this->dyna.actor.posRot.pos.z) { + while ((this->dyna.actor.posRot.pos.z - this->dyna.actor.initPosRot.pos.z) >= 20.0f) { + this->dyna.actor.initPosRot.pos.z += 20.0f; + } + } else { + while ((this->dyna.actor.initPosRot.pos.z - this->dyna.actor.posRot.pos.z) >= 20.0f) { + this->dyna.actor.initPosRot.pos.z -= 20.0f; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s") +s32 ObjOshihiki_NoSwitchPress(ObjOshihiki* this, DynaPolyActor* dyna, GlobalContext* globalCtx) { + s16 dynaSwitchFlag; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s") + if (dyna == NULL) { + return 1; + } else if (dyna->actor.id == ACTOR_OBJ_SWITCH) { + dynaSwitchFlag = (dyna->actor.params >> 8) & 0x3F; + switch (dyna->actor.params & 0x33) { + case 0x20: // Normal blue switch + if ((dynaSwitchFlag == ((this->dyna.actor.params >> 8) & 0x3F)) && + Flags_GetSwitch(globalCtx, dynaSwitchFlag)) { + return 0; + } + break; + case 0x30: // Inverse blue switch + if ((dynaSwitchFlag == ((this->dyna.actor.params >> 8) & 0x3F)) && + !Flags_GetSwitch(globalCtx, dynaSwitchFlag)) { + return 0; + } + break; + } + } + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s") +void ObjOshihiki_CheckType(ObjOshihiki* this, GlobalContext* globalCtx) { + switch (this->dyna.actor.params & 0xF) { + case PUSHBLOCK_SMALL_START_ON: + case PUSHBLOCK_MEDIUM_START_ON: + case PUSHBLOCK_LARGE_START_ON: + case PUSHBLOCK_HUGE_START_ON: + case PUSHBLOCK_SMALL_START_OFF: + case PUSHBLOCK_MEDIUM_START_OFF: + case PUSHBLOCK_LARGE_START_OFF: + case PUSHBLOCK_HUGE_START_OFF: + ObjOshihiki_InitDynapoly(this, globalCtx, &D_05004E98, 1); + break; + default: + // Error : type cannot be determined + osSyncPrintf("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 444, + this->dyna.actor.params); + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s") +void ObjOshihiki_SetScale(ObjOshihiki* this, GlobalContext* globalCtx) { + Actor_SetScale(&this->dyna.actor, sScales[this->dyna.actor.params & 0xF]); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s") +void ObjOshihiki_SetTexture(ObjOshihiki* this, GlobalContext* globalCtx) { + switch (this->dyna.actor.params & 0xF) { + case PUSHBLOCK_SMALL_START_ON: + case PUSHBLOCK_MEDIUM_START_ON: + case PUSHBLOCK_SMALL_START_OFF: + case PUSHBLOCK_MEDIUM_START_OFF: + this->texture = &D_05003350; + break; + case PUSHBLOCK_LARGE_START_ON: + case PUSHBLOCK_LARGE_START_OFF: + this->texture = &D_05003B50; + break; + case PUSHBLOCK_HUGE_START_ON: + case PUSHBLOCK_HUGE_START_OFF: + this->texture = &D_05004350; + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s") +void ObjOshihiki_SetColor(ObjOshihiki* this, GlobalContext* globalCtx) { + Color_RGB8* src; + Color_RGB8* color = &this->color; + s16 paramsColorIdx; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s") + paramsColorIdx = (this->dyna.actor.params >> 6) & 3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s") + for (i = 0; i < ARRAY_COUNT(sScenes); i++) { + if (sScenes[i] == globalCtx->sceneNum) { + break; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s") + if (i >= ARRAY_COUNT(sColors)) { + // "Error : scene_data_ID cannot be determined" + osSyncPrintf("Error : scene_data_ID が判別できない。(%s %d)\n", "../z_obj_oshihiki.c", 579); + color->r = color->g = color->b = 255; + } else { + src = &sColors[i][paramsColorIdx]; + color->r = src->r; + color->g = src->g; + color->b = src->b; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s") +void ObjOshihiki_Init(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + ObjOshihiki* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s") + ObjOshihiki_CheckType(this, globalCtx); + + if ((((this->dyna.actor.params >> 8) & 0xFF) >= 0) && (((this->dyna.actor.params >> 8) & 0xFF) <= 0x3F)) { + if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F)) { + switch (this->dyna.actor.params & 0xF) { + case PUSHBLOCK_SMALL_START_ON: + case PUSHBLOCK_MEDIUM_START_ON: + case PUSHBLOCK_LARGE_START_ON: + case PUSHBLOCK_HUGE_START_ON: + Actor_Kill(&this->dyna.actor); + return; + } + } else { + switch (this->dyna.actor.params & 0xF) { + case PUSHBLOCK_SMALL_START_OFF: + case PUSHBLOCK_MEDIUM_START_OFF: + case PUSHBLOCK_LARGE_START_OFF: + case PUSHBLOCK_HUGE_START_OFF: + Actor_Kill(&this->dyna.actor); + return; + } + } + } + + ObjOshihiki_SetScale(this, globalCtx); + ObjOshihiki_SetTexture(this, globalCtx); + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + this->dyna.actor.colChkInfo.mass = 0xFF; + ObjOshihiki_SetColor(this, globalCtx); + ObjOshihiki_ResetFloors(this); + ObjOshihiki_SetupOnActor(this, globalCtx); + // (dungeon keep push-pull block) + osSyncPrintf("(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n", this->dyna.actor.params); +} + +void ObjOshihiki_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjOshihiki* this = THIS; + + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +void ObjOshihiki_SetFloors(ObjOshihiki* this, GlobalContext* globalCtx) { + s32 i; + + for (i = 0; i < 5; i++) { + Vec3f colCheckPoint; + Vec3f colCheckOffset; + CollisionPoly** floorPoly; + s32* floorBgId; + + colCheckOffset.x = sColCheckPoints[i].x * (this->dyna.actor.scale.x * 10.0f); + colCheckOffset.y = sColCheckPoints[i].y * (this->dyna.actor.scale.y * 10.0f); + colCheckOffset.z = sColCheckPoints[i].z * (this->dyna.actor.scale.z * 10.0f); + ObjOshihiki_RotateXZ(&colCheckPoint, &colCheckOffset, this->yawSin, this->yawCos); + colCheckPoint.x += this->dyna.actor.posRot.pos.x; + colCheckPoint.y += this->dyna.actor.pos4.y; + colCheckPoint.z += this->dyna.actor.posRot.pos.z; + + floorPoly = &this->floorPolys[i]; + floorBgId = &this->floorBgIds[i]; + this->floorHeights[i] = + func_8003CA64(&globalCtx->colCtx, floorPoly, floorBgId, &this->dyna.actor, &colCheckPoint, 0.0f); + } +} + +s16 ObjOshihiki_GetHighestFloor(ObjOshihiki* this) { + s16 highestFloor = 0; + s16 temp = 1; + f32 phi_f0 = this->floorHeights[temp]; + + if (phi_f0 > this->floorHeights[highestFloor]) { + highestFloor = temp; + } else if ((this->floorBgIds[temp] == 50) && ((phi_f0 - this->floorHeights[highestFloor]) > -0.001f)) { + highestFloor = temp; + } + if (this->floorHeights[temp + 1] > this->floorHeights[highestFloor]) { + highestFloor = temp + 1; + } else if ((this->floorBgIds[temp + 1] == 50) && + ((this->floorHeights[temp + 1] - this->floorHeights[highestFloor]) > -0.001f)) { + highestFloor = temp + 1; + } + if (this->floorHeights[temp + 2] > this->floorHeights[highestFloor]) { + highestFloor = temp + 2; + } else if ((this->floorBgIds[temp + 2] == 50) && + ((this->floorHeights[temp + 2] - this->floorHeights[highestFloor]) > -0.001f)) { + highestFloor = temp + 2; + } + if (this->floorHeights[temp + 3] > this->floorHeights[highestFloor]) { + highestFloor = temp + 3; + } else if ((this->floorBgIds[temp + 3] == 50) && + ((this->floorHeights[temp + 3] - this->floorHeights[highestFloor]) > -0.001f)) { + highestFloor = temp + 3; + } + return highestFloor; +} + +void ObjOshihiki_SetGround(ObjOshihiki* this, GlobalContext* globalCtx) { + ObjOshihiki_ResetFloors(this); + ObjOshihiki_SetFloors(this, globalCtx); + this->highestFloor = ObjOshihiki_GetHighestFloor(this); + this->dyna.actor.groundY = this->floorHeights[this->highestFloor]; +} + +s32 ObjOshihiki_CheckFloor(ObjOshihiki* this, GlobalContext* globalCtx) { + ObjOshihiki_SetGround(this, globalCtx); + + if ((this->dyna.actor.groundY - this->dyna.actor.posRot.pos.y) >= -0.001f) { + this->dyna.actor.posRot.pos.y = this->dyna.actor.groundY; + return 1; + } + + return 0; +} + +s32 ObjOshihiki_CheckGround(ObjOshihiki* this, GlobalContext* globalCtx) { + if (this->dyna.actor.posRot.pos.y <= -31990.0f) { + // Warning : Push-pull block fell too much + osSyncPrintf("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 809, + this->dyna.actor.params); + Actor_Kill(&this->dyna.actor); + return 0; + } + if ((this->dyna.actor.groundY - this->dyna.actor.posRot.pos.y) >= -0.001f) { + this->dyna.actor.posRot.pos.y = this->dyna.actor.groundY; + return 1; + } + return 0; +} + +s32 ObjOshihiki_CheckWall(GlobalContext* globalCtx, s16 angle, f32 direction, ObjOshihiki* this) { + f32 maxDist = ((direction >= 0.0f) ? 1.0f : -1.0f) * (300.0f * this->dyna.actor.scale.x + 20.0f - 0.5f); + f32 sn = Math_Sins(angle); + f32 cs = Math_Coss(angle); + s32 i; + + for (i = 0; i < 4; i++) { + Vec3f faceVtx; + Vec3f faceVtxNext; + Vec3f posResult; + Vec3f faceVtxOffset; + u32 bgId; + CollisionPoly* outPoly; + + faceVtxOffset.x = (sFaceVtx[i].x * this->dyna.actor.scale.x * 10.0f) + sFaceDirection[i].x; + faceVtxOffset.y = (sFaceVtx[i].y * this->dyna.actor.scale.y * 10.0f) + sFaceDirection[i].y; + faceVtxOffset.z = 0.0f; + ObjOshihiki_RotateXZ(&faceVtx, &faceVtxOffset, sn, cs); + faceVtx.x += this->dyna.actor.posRot.pos.x; + faceVtx.y += this->dyna.actor.posRot.pos.y; + faceVtx.z += this->dyna.actor.posRot.pos.z; + faceVtxNext.x = faceVtx.x + maxDist * sn; + faceVtxNext.y = faceVtx.y; + faceVtxNext.z = faceVtx.z + maxDist * cs; + if (func_8003DFA0(&globalCtx->colCtx, &faceVtx, &faceVtxNext, &posResult, &outPoly, 1, 0, 0, 1, &bgId, + &this->dyna.actor, 0.0f)) { + return 1; + } + } + return 0; +} + +s32 ObjOshihiki_MoveWithBlockUnder(ObjOshihiki* this, GlobalContext* globalCtx) { + s32 pad; + ObjOshihiki* blockUnder = ObjOshihiki_GetBlockUnder(this, globalCtx); + + if ((blockUnder != NULL) && (blockUnder->stateFlags & PUSHBLOCK_SETUP_PUSH) && + !ObjOshihiki_CheckWall(globalCtx, blockUnder->dyna.unk_158, blockUnder->direction, this)) { + this->blockUnder = blockUnder; + } + + if ((this->stateFlags & PUSHBLOCK_MOVE_UNDER) && (this->blockUnder != NULL)) { + if (this->blockUnder->stateFlags & PUSHBLOCK_PUSH) { + this->underDistX = this->blockUnder->dyna.actor.posRot.pos.x - this->blockUnder->dyna.actor.pos4.x; + this->underDistZ = this->blockUnder->dyna.actor.posRot.pos.z - this->blockUnder->dyna.actor.pos4.z; + this->dyna.actor.posRot.pos.x += this->underDistX; + this->dyna.actor.posRot.pos.z += this->underDistZ; + ObjOshihiki_UpdateInitPos(this); + return 1; + } else if (!(this->blockUnder->stateFlags & PUSHBLOCK_SETUP_PUSH)) { + this->blockUnder = NULL; + } + } + return 0; +} + +void ObjOshihiki_SetupOnScene(ObjOshihiki* this, GlobalContext* globalCtx) { + this->stateFlags |= PUSHBLOCK_SETUP_ON_SCENE; + this->actionFunc = ObjOshihiki_OnScene; + this->dyna.actor.gravity = 0.0f; + this->dyna.actor.velocity.x = this->dyna.actor.velocity.y = this->dyna.actor.velocity.z = 0.0f; +} + +void ObjOshihiki_OnScene(ObjOshihiki* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; + + this->stateFlags |= PUSHBLOCK_ON_SCENE; + if ((this->timer <= 0) && (fabsf(this->dyna.unk_150) > 0.001f)) { + if (ObjOshihiki_StrongEnough(this) && + !ObjOshihiki_CheckWall(globalCtx, this->dyna.unk_158, this->dyna.unk_150, this)) { + this->direction = this->dyna.unk_150; + ObjOshihiki_SetupPush(this, globalCtx); + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } +} + +void ObjOshihiki_SetupOnActor(ObjOshihiki* this, GlobalContext* globalCtx) { + this->stateFlags |= PUSHBLOCK_SETUP_ON_ACTOR; + this->actionFunc = ObjOshihiki_OnActor; + this->dyna.actor.velocity.z = 0.0f; + this->dyna.actor.velocity.y = 0.0f; + this->dyna.actor.velocity.x = 0.0f; + this->dyna.actor.gravity = -1.0f; +} + +void ObjOshihiki_OnActor(ObjOshihiki* this, GlobalContext* globalCtx) { + s32 bgId; + Player* player = PLAYER; + DynaPolyActor* dynaActor; + + this->stateFlags |= PUSHBLOCK_ON_ACTOR; + Actor_MoveForward(&this->dyna.actor); + + if (ObjOshihiki_CheckFloor(this, globalCtx)) { + bgId = this->floorBgIds[this->highestFloor]; + if (bgId == 50) { + ObjOshihiki_SetupOnScene(this, globalCtx); + } else { + dynaActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, bgId); + if (dynaActor != NULL) { + func_800434A8(dynaActor); + func_80043538(dynaActor); + + if ((this->timer <= 0) && (fabsf(this->dyna.unk_150) > 0.001f)) { + if (ObjOshihiki_StrongEnough(this) && ObjOshihiki_NoSwitchPress(this, dynaActor, globalCtx) && + !ObjOshihiki_CheckWall(globalCtx, this->dyna.unk_158, this->dyna.unk_150, this)) { + + this->direction = this->dyna.unk_150; + ObjOshihiki_SetupPush(this, globalCtx); + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } + } else { + ObjOshihiki_SetupOnScene(this, globalCtx); + } + } + } else { + bgId = this->floorBgIds[this->highestFloor]; + if (bgId == 50) { + ObjOshihiki_SetupFall(this, globalCtx); + } else { + dynaActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, bgId); + + if ((dynaActor != NULL) && (dynaActor->unk_15C & 1)) { + func_800434A8(dynaActor); + func_80043538(dynaActor); + this->dyna.actor.posRot.pos.y = this->dyna.actor.groundY; + } else { + ObjOshihiki_SetupFall(this, globalCtx); + } + } + } +} + +void ObjOshihiki_SetupPush(ObjOshihiki* this, GlobalContext* globalCtx) { + this->stateFlags |= PUSHBLOCK_SETUP_PUSH; + this->actionFunc = ObjOshihiki_Push; + this->dyna.actor.gravity = 0.0f; +} + +void ObjOshihiki_Push(ObjOshihiki* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + Player* player = PLAYER; + f32 pushDistSigned; + s32 stopFlag; + + this->pushSpeed += 0.5f; + this->stateFlags |= PUSHBLOCK_PUSH; + this->pushSpeed = CLAMP_MAX(this->pushSpeed, 2.0f); + stopFlag = Math_ApproxF(&this->pushDist, 20.0f, this->pushSpeed); + pushDistSigned = ((this->direction >= 0.0f) ? 1.0f : -1.0f) * this->pushDist; + thisx->posRot.pos.x = thisx->initPosRot.pos.x + (pushDistSigned * this->yawSin); + thisx->posRot.pos.z = thisx->initPosRot.pos.z + (pushDistSigned * this->yawCos); + + if (!ObjOshihiki_CheckFloor(this, globalCtx)) { + thisx->initPosRot.pos.x = thisx->posRot.pos.x; + thisx->initPosRot.pos.z = thisx->posRot.pos.z; + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + this->pushDist = 0.0f; + this->pushSpeed = 0.0f; + ObjOshihiki_SetupFall(this, globalCtx); + } else if (stopFlag) { + player = PLAYER; + if (ObjOshihiki_CheckWall(globalCtx, this->dyna.unk_158, this->dyna.unk_150, this)) { + Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); + } + + thisx->initPosRot.pos.x = thisx->posRot.pos.x; + thisx->initPosRot.pos.z = thisx->posRot.pos.z; + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + this->pushDist = 0.0f; + this->pushSpeed = 0.0f; + this->timer = 10; + if (this->floorBgIds[this->highestFloor] == 50) { + ObjOshihiki_SetupOnScene(this, globalCtx); + } else { + ObjOshihiki_SetupOnActor(this, globalCtx); + } + } + Audio_PlayActorSound2(thisx, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); +} + +void ObjOshihiki_SetupFall(ObjOshihiki* this, GlobalContext* globalCtx) { + this->stateFlags |= PUSHBLOCK_SETUP_FALL; + this->dyna.actor.velocity.x = this->dyna.actor.velocity.y = this->dyna.actor.velocity.z = 0.0f; + this->dyna.actor.gravity = -1.0f; + ObjOshihiki_SetGround(this, globalCtx); + this->actionFunc = ObjOshihiki_Fall; +} + +void ObjOshihiki_Fall(ObjOshihiki* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->stateFlags |= PUSHBLOCK_FALL; + if (fabsf(this->dyna.unk_150) > 0.001f) { + this->dyna.unk_150 = 0.0f; + player->stateFlags2 &= ~0x10; + } + Actor_MoveForward(&this->dyna.actor); + if (ObjOshihiki_CheckGround(this, globalCtx)) { + if (this->floorBgIds[this->highestFloor] == 50) { + ObjOshihiki_SetupOnScene(this, globalCtx); + } else { + ObjOshihiki_SetupOnActor(this, globalCtx); + } + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Audio_PlayActorSound2(&this->dyna.actor, func_80041F34(&globalCtx->colCtx, this->floorPolys[this->highestFloor], + this->floorBgIds[this->highestFloor]) + + SFX_FLAG); + } +} + +void ObjOshihiki_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjOshihiki* this = THIS; + + this->stateFlags &= + ~(PUSHBLOCK_SETUP_FALL | PUSHBLOCK_FALL | PUSHBLOCK_SETUP_PUSH | PUSHBLOCK_PUSH | PUSHBLOCK_SETUP_ON_ACTOR | + PUSHBLOCK_ON_ACTOR | PUSHBLOCK_SETUP_ON_SCENE | PUSHBLOCK_ON_SCENE); + this->stateFlags |= PUSHBLOCK_MOVE_UNDER; + + if (this->timer > 0) { + this->timer--; + } + + this->dyna.actor.posRot.rot.y = this->dyna.unk_158; + + this->yawSin = Math_Sins(this->dyna.actor.posRot.rot.y); + this->yawCos = Math_Coss(this->dyna.actor.posRot.rot.y); + + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjOshihiki* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_oshihiki.c", 1289); + if (ObjOshihiki_MoveWithBlockUnder(this, globalCtx)) { + Matrix_Translate(this->underDistX * 10.0f, 0.0f, this->underDistZ * 10.0f, 1); + } + this->stateFlags &= ~PUSHBLOCK_MOVE_UNDER; + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(this->texture)); + + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_oshihiki.c", 1308), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + switch (globalCtx->sceneNum) { + case SCENE_YDAN: + case SCENE_DDAN: + case SCENE_BMORI1: + case SCENE_HIDAN: + case SCENE_MIZUSIN: + case SCENE_JYASINZOU: + case SCENE_HAKADAN: + case SCENE_MEN: + gDPSetEnvColor(POLY_OPA_DISP++, this->color.r, this->color.g, this->color.b, 255); + break; + default: + gDPSetEnvColor(POLY_OPA_DISP++, mREG(13), mREG(14), mREG(15), 255); + break; + } + + gSPDisplayList(POLY_OPA_DISP++, &D_05004CD0); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_oshihiki.c", 1334); +} diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h index 14677efb0b..0655964fac 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h @@ -6,11 +6,49 @@ struct ObjOshihiki; +typedef enum { + /* 0 */ PUSHBLOCK_SMALL_START_ON, + /* 1 */ PUSHBLOCK_MEDIUM_START_ON, + /* 2 */ PUSHBLOCK_LARGE_START_ON, + /* 3 */ PUSHBLOCK_HUGE_START_ON, + /* 4 */ PUSHBLOCK_SMALL_START_OFF, + /* 5 */ PUSHBLOCK_MEDIUM_START_OFF, + /* 6 */ PUSHBLOCK_LARGE_START_OFF, + /* 7 */ PUSHBLOCK_HUGE_START_OFF +} PushBlockType; + +#define PUSHBLOCK_ON_SCENE (1 << 0) +#define PUSHBLOCK_SETUP_ON_SCENE (1 << 1) +#define PUSHBLOCK_ON_ACTOR (1 << 2) +#define PUSHBLOCK_SETUP_ON_ACTOR (1 << 3) +#define PUSHBLOCK_PUSH (1 << 4) +#define PUSHBLOCK_SETUP_PUSH (1 << 5) +#define PUSHBLOCK_FALL (1 << 6) +#define PUSHBLOCK_SETUP_FALL (1 << 7) +#define PUSHBLOCK_MOVE_UNDER (1 << 8) + +typedef void (*ObjOshihikiActionFunc)(struct ObjOshihiki*, GlobalContext*); + typedef struct ObjOshihiki { /* 0x0000 */ DynaPolyActor dyna; - /* 0x0164 */ char unk_164[0x5A]; - /* 0x01BE */ u8 unk_1BE; - /* 0x01BF */ char unk_1BF[0x15]; + /* 0x0164 */ ObjOshihikiActionFunc actionFunc; + /* 0x0168 */ u16 stateFlags; + /* 0x016A */ s16 timer; + /* 0x016C */ f32 yawSin; + /* 0x0170 */ f32 yawCos; + /* 0x0174 */ f32 pushSpeed; + /* 0x0178 */ f32 pushDist; + /* 0x017C */ f32 direction; + /* 0x0180 */ s32 floorBgIds[5]; + /* 0x0194 */ CollisionPoly* floorPolys[5]; + /* 0x01A8 */ f32 floorHeights[5]; + /* 0x01BC */ s16 highestFloor; + /* 0x01BE */ u8 cantMove; + /* 0x01C0 */ struct ObjOshihiki* blockUnder; + /* 0x01C4 */ f32 underDistX; + /* 0x01C8 */ f32 underDistZ; + /* 0x01CC */ void* texture; + /* 0x01D0 */ Color_RGB8 color; } ObjOshihiki; // size = 0x01D4 extern const ActorInit Obj_Oshihiki_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index ca2271722c..7e1aba115d 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -242,10 +242,10 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 707); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 714), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 714), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyOpa.p++, displayLists[(u16)this->actor.params >> 0xC]); + gSPDisplayList(POLY_OPA_DISP++, displayLists[(u16)this->actor.params >> 0xC]); if (this->litTimer != 0) { f32 flameScale = 1.0f; @@ -259,23 +259,23 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->flameTexScroll * -20) & 0x1FF, 0x20, 0x80)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 0, 255); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); Matrix_Translate(0.0f, 52.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) - this->actor.shape.rot.y + 0x8000) * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(flameScale, flameScale, flameScale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 745), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 745), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 749); } diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 040ffc1569..ebc2bfe6eb 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -154,12 +154,12 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 469), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 469), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, 1, 0, scroll * (-8), 32, 32)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sCylinderDl); + gSPDisplayList(POLY_XLU_DISP++, sCylinderDl); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 485); } diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index f45981a59e..8103a05af8 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -130,18 +130,18 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 449); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); if (1) {} - oGfxCtx->polyXlu.p = func_80093F34(oGfxCtx->polyXlu.p); - gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_NOISE); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_NOISE); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 200, 200, 150, this->primColorAlpha); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 8, scroll * 4, 64, 64, 1, + POLY_XLU_DISP = func_80093F34(POLY_XLU_DISP); + gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 150, this->primColorAlpha); + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 8, scroll * 4, 64, 64, 1, scroll * 4, scroll * 4, 64, 64)); - gSPTextureRectangle(oGfxCtx->polyXlu.p++, 0, 0, (SCREEN_WIDTH << 2), (SCREEN_HEIGHT << 2), G_TX_RENDERTILE, 0, 0, + gSPTextureRectangle(POLY_XLU_DISP++, 0, 0, (SCREEN_WIDTH << 2), (SCREEN_HEIGHT << 2), G_TX_RENDERTILE, 0, 0, 140, (1 << 15) | (31 << 10) | 884); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 477); @@ -156,21 +156,21 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 200, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 150, 150, 0, 128); - gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_NOISE); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_NOISE); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 200, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 0, 128); + gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE); vtxPtr[0].v.cn[3] = vtxPtr[6].v.cn[3] = vtxPtr[16].v.cn[3] = vtxPtr[25].v.cn[3] = this->vtxAlpha >> 1; vtxPtr[10].v.cn[3] = vtxPtr[22].v.cn[3] = this->vtxAlpha; - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 498), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 498), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, sCylinderTexDl); - gSPDisplayList(oGfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 4, (0 - scroll) * 8, 32, + gSPDisplayList(POLY_XLU_DISP++, sCylinderTexDl); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 4, (0 - scroll) * 8, 32, 32, 1, scroll * 8, (0 - scroll) * 12, 32, 32)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sCylinderDl); + gSPDisplayList(POLY_XLU_DISP++, sCylinderDl); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 512); diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 92468a9f0c..5f8bdb90e3 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -108,21 +108,21 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800D1FD4(&globalCtx->mf_11DA0); Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 375), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 375), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params) { - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 170, 255, 255, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 150, 255, 128); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 150, 255, 128); } else { - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 200, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 100, 0, 255, 128); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 200, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 100, 0, 255, 128); } - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 - scroll, scroll * (-2), 32, 32, + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 - scroll, scroll * (-2), 32, 32, 1, 0 - scroll, scroll * (-2), 32, 32)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sFrustrumDl); + gSPDisplayList(POLY_XLU_DISP++, sFrustrumDl); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 398); } diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 7e8b3b818b..8eb698681a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -96,15 +96,15 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800D1FD4(&globalCtx->mf_11DA0); Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 400), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 400), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 170, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 100, 0, 128); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 6, scroll * (-6), 64, 64, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 100, 0, 128); + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 6, scroll * (-6), 64, 64, 1, scroll * (-6), 0, 64, 64)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sFrustrumDl); + gSPDisplayList(POLY_XLU_DISP++, sFrustrumDl); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 417); } diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index eb26284df2..ad8f7f94a7 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -97,15 +97,15 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800D1FD4(&globalCtx->mf_11DA0); Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 353), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 353), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 170, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 100, 200, 0, 128); - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL); - gSPDisplayList(oGfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 12, scroll * (-12), 64, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 128); + gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 12, scroll * (-12), 64, 64, 1, scroll * 8, scroll * (-8), 64, 64)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sFrustrumDl); + gSPDisplayList(POLY_XLU_DISP++, sFrustrumDl); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 370); } diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index d3449f812e..027b6bf647 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -91,19 +91,19 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800D1FD4(&globalCtx->mf_11DA0); Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 324), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 324), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params == 1) { - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL1); + gSPDisplayList(POLY_XLU_DISP++, sTextureDL1); } else { - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL0); + gSPDisplayList(POLY_XLU_DISP++, sTextureDL0); } - gSPDisplayList(oGfxCtx->polyXlu.p++, sTextureDL2); - gSPDisplayList(oGfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 64, + gSPDisplayList(POLY_XLU_DISP++, sTextureDL2); + gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 64, 1, scroll * (-1), scroll, 32, 32)); - gSPDisplayList(oGfxCtx->polyXlu.p++, sFrustrumDl); + gSPDisplayList(POLY_XLU_DISP++, sFrustrumDl); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 344); } diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 7dd9c5a98d..274c72de2a 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -5,6 +5,7 @@ */ #include "z_shot_sun.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "vt.h" #define FLAGS 0x00000009 @@ -72,7 +73,7 @@ void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx) { void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx) { s32 params = this->actor.params & 0xFF; - s32 fairyParams; + s32 fairyType; if (this->timer > 0) { this->timer--; @@ -81,16 +82,16 @@ void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx) { switch (params) { case 0x40: - fairyParams = 7; + fairyType = FAIRY_HEAL_BIG; break; case 0x41: - fairyParams = 7; + fairyType = FAIRY_HEAL_BIG; break; } - // UB: fairyParams may be uninitialized + //! @bug fairyType may be uninitialized Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.initPosRot.pos.x, - this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, fairyParams); + this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, fairyType); Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 2e7edd60ff..20b780598f 100644 --- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -50,13 +50,13 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) { pauseCtx->inputX = input->rel.stick_x; pauseCtx->inputY = input->rel.stick_y; - gSPSegment(oGfxCtx->polyOpa.p++, 0x02, interfaceCtx->parameterSegment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x07, pauseCtx->unk_13C); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, pauseCtx->unk_128); - gSPSegment(oGfxCtx->polyOpa.p++, 0x09, pauseCtx->unk_12C); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, pauseCtx->unk_138); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, pauseCtx->unk_130); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0D, pauseCtx->unk_134); + gSPSegment(POLY_OPA_DISP++, 0x02, interfaceCtx->parameterSegment); + gSPSegment(POLY_OPA_DISP++, 0x07, pauseCtx->unk_13C); + gSPSegment(POLY_OPA_DISP++, 0x08, pauseCtx->unk_128); + gSPSegment(POLY_OPA_DISP++, 0x09, pauseCtx->unk_12C); + gSPSegment(POLY_OPA_DISP++, 0x0A, pauseCtx->unk_138); + gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->unk_130); + gSPSegment(POLY_OPA_DISP++, 0x0D, pauseCtx->unk_134); if (pauseCtx->flag == 0) { func_80823994(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z); @@ -65,7 +65,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) { func_80820434(globalCtx, globalCtx->state.gfxCtx); func_800949A8(globalCtx->state.gfxCtx); - gDPSetCombineLERP(oGfxCtx->polyOpa.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); func_80823994(pauseCtx, 0.0f, 0.0f, 64.0f); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index c68642e50c..e0070f1ebc 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -12,6 +12,7 @@ #include "overlays/actors/ovl_En_Boom/z_en_boom.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" @@ -1341,7 +1342,7 @@ void func_808326F0(Player* this) { s32 i; for (i = 0; i < 4; i++) { - func_800F8D04(*entry + this->ageProperties->unk_92); + func_800F8D04((u16)(*entry + this->ageProperties->unk_92)); entry++; } } @@ -3972,7 +3973,7 @@ s16 D_808544F8[] = { 0x045B, 0x0482, 0x0340, 0x044B, 0x02A2, 0x0201, 0x03B8, 0x04EE, 0x03C0, 0x0463, 0x01CD, 0x0394, 0x0340, 0x057C, }; -u8 D_80854514[] = { 11, 9, 3, 5, 7 }; +u8 D_80854514[] = { 11, 9, 3, 5, 7, 0 }; s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2, u32 arg3) { s32 sp3C; @@ -4110,7 +4111,7 @@ void func_808395DC(Player* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) { arg3->z = arg1->z + ((arg2->z * cos) - (arg2->x * sin)); } -Actor* func_80839680(GlobalContext* globalCtx, Player* this, Vec3f* arg2, Vec3f* arg3, s32 type) { +Actor* Player_SpawnFairy(GlobalContext* globalCtx, Player* this, Vec3f* arg2, Vec3f* arg3, s32 type) { Vec3f pos; func_808395DC(this, arg2, arg3, &pos); @@ -4891,8 +4892,8 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { sp24 = (sp30 != NULL) && (((sp30->flags & 0x40001) == 0x40001) || (sp30->naviEnemyId != 0xFF)); - if (sp24 || (this->naviMessageId != 0)) { - sp28 = (this->naviMessageId < 0) && ((ABS(this->naviMessageId) & 0xFF00) != 0x200); + if (sp24 || (this->naviTextId != 0)) { + sp28 = (this->naviTextId < 0) && ((ABS(this->naviTextId) & 0xFF00) != 0x200); if (sp28 || !sp24) { sp2C = this->naviActor; if (sp28) { @@ -4934,10 +4935,10 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { this->targetActor = NULL; if (sp28 || !sp24) { - if (this->naviMessageId >= 0) { - sp2C->textId = this->naviMessageId; + if (this->naviTextId >= 0) { + sp2C->textId = this->naviTextId; } else { - sp2C->textId = -this->naviMessageId; + sp2C->textId = -this->naviTextId; } } else { if (sp2C->naviEnemyId != 0xFF) { @@ -4978,9 +4979,8 @@ s32 func_8083B998(Player* this, GlobalContext* globalCtx) { if ((this->unk_664 != NULL) && (((this->unk_664->flags & 0x40001) == 0x40001) || (this->unk_664->naviEnemyId != 0xFF))) { this->stateFlags2 |= 0x200000; - } else if ((this->naviMessageId == 0) && !func_8008E9C4(this) && - CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && (YREG(15) != 0x10) && (YREG(15) != 0x20) && - !func_8083B8F4(this, globalCtx)) { + } else if ((this->naviTextId == 0) && !func_8008E9C4(this) && CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && + (YREG(15) != 0x10) && (YREG(15) != 0x20) && !func_8083B8F4(this, globalCtx)) { func_80078884(NA_SE_SY_ERROR); } @@ -7896,7 +7896,7 @@ void func_80843AE8(GlobalContext* globalCtx, Player* this) { } } else if (this->unk_84F != 0) { this->unk_850 = 60; - func_80839680(globalCtx, this, &this->actor.posRot.pos, &D_808545E4, 5); + Player_SpawnFairy(globalCtx, this, &this->actor.posRot.pos, &D_808545E4, FAIRY_REVIVE_DEATH); func_8002F7DC(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); func_800800F8(globalCtx, 0x26B4, 125, &this->actor, 0); } else if (globalCtx->unk_10A20 == 2) { @@ -9164,7 +9164,7 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx) { if (initMode != 0) { if ((gSaveContext.gameMode == 0) || (gSaveContext.gameMode == 3)) { - this->naviActor = func_80839680(globalCtx, this, &this->actor.posRot.pos, &D_80854778, 0); + this->naviActor = Player_SpawnFairy(globalCtx, this, &this->actor.posRot.pos, &D_80854778, FAIRY_NAVI); if (gSaveContext.dogParams != 0) { gSaveContext.dogParams |= 0x8000; } @@ -10158,7 +10158,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { func_8083D6EC(globalCtx, this); - if ((this->unk_664 == NULL) && (this->naviMessageId == 0)) { + if ((this->unk_664 == NULL) && (this->naviTextId == 0)) { this->stateFlags2 &= ~0x200002; } @@ -10209,7 +10209,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { this->rideActor = NULL; } - this->naviMessageId = 0; + this->naviTextId = 0; if (!(this->stateFlags2 & 0x2000000)) { this->unk_6A8 = NULL; @@ -10350,8 +10350,8 @@ void func_8084A0E8(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDLi OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19228); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, cullDList); - gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, cullDList); + gSPSegment(POLY_OPA_DISP++, 0x0C, cullDList); + gSPSegment(POLY_XLU_DISP++, 0x0C, cullDList); func_8008F470(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, lod, this->currentTunic, this->currentBoots, this->actor.shape.unk_06, overrideLimbDraw, func_80090D20, @@ -10363,7 +10363,7 @@ void func_8084A0E8(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDLi if (this->currentMask == PLAYER_MASK_BUNNY) { Vec3s sp68; - gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, sp70); + gSPSegment(POLY_OPA_DISP++, 0x0B, sp70); sp68.x = D_80858AC8[1] + 0x3E2; sp68.y = D_80858AC8[2] + 0xDBE; @@ -10378,7 +10378,7 @@ void func_8084A0E8(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDLi Matrix_ToMtx(sp70, "../z_player.c", 19279); } - gSPDisplayList(oGfxCtx->polyOpa.p++, D_80854844[this->currentMask - 1]); + gSPDisplayList(POLY_OPA_DISP++, D_80854844[this->currentMask - 1]); } if ((this->currentBoots == PLAYER_BOOTS_HOVER) && !(this->actor.bgCheckFlags & 1) && @@ -10406,14 +10406,14 @@ void func_8084A0E8(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDLi &D_80854864); Matrix_Scale(4.0f, 4.0f, 4.0f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19317), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19317), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 32, 1, 0, (globalCtx->gameplayFrames * -15) % 128, 16, 32)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 255, D_8085486C); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 120, 90, 30, 128); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04037E30); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, D_8085486C); + gDPSetEnvColor(POLY_XLU_DISP++, 120, 90, 30, 128); + gSPDisplayList(POLY_XLU_DISP++, D_04037E30); } } @@ -10444,7 +10444,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->invincibilityTimer > 0) { this->unk_88F += CLAMP(50 - this->invincibilityTimer, 8, 40); - oGfxCtx->polyOpa.p = Gfx_SetFog2(oGfxCtx->polyOpa.p, 255, 0, 0, 0, 0, + POLY_OPA_DISP = Gfx_SetFog2(POLY_OPA_DISP, 255, 0, 0, 0, 0, 4000 - (s32)(Math_Coss(this->unk_88F * 256) * 2000.0f)); } @@ -10485,27 +10485,27 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pull(); } - gSPClearGeometryMode(oGfxCtx->polyOpa.p++, G_CULL_BOTH); - gSPClearGeometryMode(oGfxCtx->polyXlu.p++, G_CULL_BOTH); + gSPClearGeometryMode(POLY_OPA_DISP++, G_CULL_BOTH); + gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BOTH); func_8084A0E8(globalCtx, this, lod, gCullBackDList, overrideLimbDraw); if (this->invincibilityTimer > 0) { - oGfxCtx->polyOpa.p = func_800BC8A0(globalCtx, oGfxCtx->polyOpa.p); + POLY_OPA_DISP = func_800BC8A0(globalCtx, POLY_OPA_DISP); } if (this->stateFlags2 & 0x4000) { f32 scale = (this->unk_84F >> 1) * 22.0f; - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) % 128, 32, 32, 1, 0, (globalCtx->gameplayFrames * -2) % 128, 32, 32)); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19459), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19459), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 50, 100, 255); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04033EE0); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, 255); + gSPDisplayList(POLY_XLU_DISP++, D_04033EE0); } if (this->unk_862 > 0) { @@ -11909,9 +11909,9 @@ void func_8084E3C4(Player* this, GlobalContext* globalCtx) { if ((this->targetActor != NULL) && (this->targetActor == this->unk_6A8)) { func_80853148(globalCtx, this->targetActor); - } else if (this->naviMessageId < 0) { + } else if (this->naviTextId < 0) { this->targetActor = this->naviActor; - this->naviActor->textId = -this->naviMessageId; + this->naviActor->textId = -this->naviTextId; func_80853148(globalCtx, this->targetActor); } else if (!func_8083B040(this, globalCtx)) { func_8083A098(this, &D_04003098, globalCtx); @@ -12099,7 +12099,7 @@ void func_8084EAC0(Player* this, GlobalContext* globalCtx) { } if (sp28 & 2) { - func_80087680(globalCtx); + Magic_Fill(globalCtx); } if (sp28 & 4) { @@ -12205,7 +12205,7 @@ void func_8084EED8(Player* this, GlobalContext* globalCtx) { } if (func_800A4530(&this->skelAnime, 37.0f)) { - func_80839680(globalCtx, this, &this->leftHandPos, &D_80854A1C, 1); + Player_SpawnFairy(globalCtx, this, &this->leftHandPos, &D_80854A1C, FAIRY_REVIVE_BOTTLE); Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); func_8002F7DC(&this->actor, NA_SE_EV_BOTTLE_CAP_OPEN); func_8002F7DC(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index 02d838cb3e..ab9c8fb543 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -67,15 +67,15 @@ void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { radius = this->rScale * 0.0025f; func_80093D84(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); func_800BFCB8(globalCtx, &mf, &this->pos); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); Matrix_Put(&mf); Matrix_Scale(radius, radius, radius, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_blast.c", 199), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_blast.c", 199), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_ss_blast.c", 204); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 0a25635f9c..03d0707386 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -65,20 +65,20 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gDPPipeSync(POLY_XLU_DISP++); func_80094C50(gfxCtx); color = this->life * 12.75f; - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, color, color, color, color); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, color, color, color, color); + gDPPipeSync(POLY_XLU_DISP++); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); + gDPPipeSync(POLY_XLU_DISP++); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_bomb.c", 214); diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index 50df0e4265..06b3e18829 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -86,13 +86,13 @@ void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this) mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(textures[this->rTexIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(textures[this->rTexIdx])); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } if (1) {} @@ -131,18 +131,18 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx2 = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx2 != NULL) { func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(textures[this->rTexIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0400BFE8); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0400C040); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(textures[this->rTexIdx])); + gSPDisplayList(POLY_XLU_DISP++, D_0400BFE8); + gSPDisplayList(POLY_XLU_DISP++, D_0400C040); Matrix_MtxToMtxF(mtx2, &mtx2F); Matrix_Put(&mtx2F); @@ -151,9 +151,9 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th Matrix_Translate(0.0f, 0.0f, depth, MTXMODE_APPLY); Matrix_RotateZ((this->life * 0.02f) + 180.0f, MTXMODE_APPLY); Matrix_Scale(layer2Scale, layer2Scale, layer2Scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_bomb2.c", 448), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_bomb2.c", 448), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0400C040); + gSPDisplayList(POLY_XLU_DISP++, D_0400C040); layer2Scale -= 0.15f; } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index 88b9edd2a6..ad56cb8b72 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -49,13 +49,13 @@ void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_bubble.c", 167), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_bubble.c", 167), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D18(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 255, 255, 255, 255); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 150, 150, 150, 0); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, this->gfx); - gSPDisplayList(oGfxCtx->polyOpa.p++, SEGMENTED_TO_VIRTUAL(D_0401A160)); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(POLY_OPA_DISP++, 150, 150, 150, 0); + gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx); + gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(D_0401A160)); CLOSE_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 179); } diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 3ca719a40d..daf253b872 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -76,7 +76,7 @@ void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { if (Object_GetIndex(&globalCtx->objectCtx, OBJECT_DODONGO) > -1) { gSegments[6] = VIRTUAL_TO_PHYSICAL(object); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + gSPSegment(POLY_XLU_DISP++, 0x06, object); scale = this->rScale / 100.0f; SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); @@ -86,14 +86,14 @@ void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80094BC4(gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index f51cbaede0..06fd3fc9fe 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -81,13 +81,13 @@ void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80094BC4(gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTextIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTextIdx])); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_dead_db.c", 247); diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index 7c518d2904..1148bf09f2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -109,14 +109,14 @@ void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { if (mtx != NULL) { func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rAlpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rAlpha); - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(oGfxCtx->polyXlu.p++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetCombineLERP(oGfxCtx->polyXlu.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rAlpha); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04037730); + gSPDisplayList(POLY_XLU_DISP++, D_04037730); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_dead_dd.c", 259); diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index c7bf7d1bf7..f61bebc1f6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -60,8 +60,8 @@ void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { scale = this->rScale * 0.01f; func_80094BC4(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, this->rAlpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, this->rAlpha); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 0); pos = this->pos; if (this->rTimer == 0) { @@ -100,11 +100,11 @@ void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_RotateRPY(this->rRoll, this->rPitch, this->rYaw, MTXMODE_APPLY); Matrix_RotateX(1.57f, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 246), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 246), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetCombineLERP(oGfxCtx->polyXlu.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, + gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04037730); + gSPDisplayList(POLY_XLU_DISP++, D_04037730); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 255); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index fb4946774b..e044635384 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -84,15 +84,15 @@ void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) scale = this->rScale * 0.004f; Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_dt_bubble.c", 213), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_dt_bubble.c", 213), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093C14(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, (this->rPrimColorA * this->life) / this->rLifespan); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, (this->rEnvColorA * this->life) / this->rLifespan); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, this->gfx); - gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_0401A160)); + gSPSegment(POLY_XLU_DISP++, 0x08, this->gfx); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0401A160)); CLOSE_DISPS(gfxCtx, "../z_eff_ss_dt_bubble.c", 236); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 20a442dc64..aad1dd137e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -98,33 +98,33 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPPipeSync(POLY_XLU_DISP++); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); + gDPPipeSync(POLY_XLU_DISP++); if (this->rDrawFlags & 1) { - gDPSetCombineLERP(oGfxCtx->polyXlu.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, + gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); - gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_FOG_SHADE_A, G_RM_ZB_CLD_SURF2); - gSPSetGeometryMode(oGfxCtx->polyXlu.p++, G_FOG | G_LIGHTING); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_FOG_SHADE_A, G_RM_ZB_CLD_SURF2); + gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING); } else if (this->rDrawFlags & 2) { - gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); - gSPClearGeometryMode(oGfxCtx->polyXlu.p++, G_FOG | G_LIGHTING); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING); } else { - gSPClearGeometryMode(oGfxCtx->polyXlu.p++, G_LIGHTING); + gSPClearGeometryMode(POLY_XLU_DISP++, G_LIGHTING); } - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_dust.c", 389); diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index b5713057d6..89bcf1a35d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -80,7 +80,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { scale = Math_Sins(this->life * 0x333) * (this->rScale * 0.00005f); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_en_fire.c", 180), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_en_fire.c", 180), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); redGreen = this->life - 5; @@ -90,16 +90,16 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { } func_80093D84(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, redGreen * 12.7f, 0, 0, 0); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x0, 0x80, redGreen * 12.7f, redGreen * 12.7f, 0, 255); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gDPSetEnvColor(POLY_XLU_DISP++, redGreen * 12.7f, 0, 0, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0x0, 0x80, redGreen * 12.7f, redGreen * 12.7f, 0, 255); + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->rScroll * -0x14) & 0x1FF, 0x20, 0x80)); if (((this->rFlags & 0x7FFF) != 0) || (this->life < 18)) { - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D5A0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D5A0); } else { - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); } CLOSE_DISPS(gfxCtx, "../z_eff_en_fire.c", 213); diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 96efce864b..8bc45ff012 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -114,7 +114,7 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY); Matrix_RotateX(this->rPitch * 0.0000958738f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_en_ice.c", 261), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_en_ice.c", 261), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); hiliteLightDir.x = 89.8f; @@ -123,13 +123,13 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { func_80093D84(globalCtx->state.gfxCtx); func_8002EB44(&this->pos, &globalCtx->view.eye, &hiliteLightDir, globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames & 0xFF, 0x20, 0x10, 1, 0, (gameplayFrames * 2) & 0xFF, 0x40, 0x20)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, (u32)alpha); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04033818); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, (u32)alpha); + gSPDisplayList(POLY_XLU_DISP++, D_04033818); CLOSE_DISPS(gfxCtx, "../z_eff_en_ice.c", 294); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index 6700549c94..24e0a84170 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -63,15 +63,15 @@ void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 168); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + gSPSegment(POLY_XLU_DISP++, 0x06, object); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); func_80093D84(globalCtx->state.gfxCtx); func_800D1FD4(&globalCtx->mf_11DA0); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 186), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 186), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rScoreIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_06000DC0)); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rScoreIdx])); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06000DC0)); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 194); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 023702c69e..59b7f97d3f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -59,15 +59,15 @@ void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY); Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_fcircle.c", 163), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_fcircle.c", 163), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 0, 32, 64, 1, 0, ((globalCtx->gameplayFrames) * -0xF) % 256, 32, 64)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 220, 0, (this->life * 12.75f)); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 220, 0, (this->life * 12.75f)); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_fcircle.c", 186); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 7c81621502..2d0ab28433 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -98,16 +98,16 @@ void EffectSsFhgFlash_DrawLightBall(GlobalContext* globalCtx, u32 index, EffectS Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, 0); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + gSPSegment(POLY_XLU_DISP++, 0x06, object); func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, this->rAlpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, sColors[this->rParam].r, sColors[this->rParam].g, sColors[this->rParam].b, 0); - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, this->rAlpha); + gDPSetEnvColor(POLY_XLU_DISP++, sColors[this->rParam].r, sColors[this->rParam].g, sColors[this->rParam].b, 0); + gDPPipeSync(POLY_XLU_DISP++); func_800D1FD4(&globalCtx->mf_11DA0); Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 326), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 326), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 330); } @@ -127,20 +127,20 @@ void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* t if (this->rParam != FHGFLASH_SHOCK_NO_ACTOR) { func_80094044(globalCtx->state.gfxCtx); Matrix_RotateX((this->rXZRot / 32768.0f) * 1.1416f, MTXMODE_APPLY); - gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_AA_ZB_XLU_DECAL2); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_DECAL2); } else { func_80093D84(globalCtx->state.gfxCtx); func_800D1FD4(&globalCtx->mf_11DA0); - gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); } - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, this->rAlpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 255, 155, 0); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, this->rAlpha); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 155, 0); Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 395), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 395), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 399); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index fe1d8222db..08d8765583 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -119,19 +119,19 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) Matrix_Scale(1.0f, temp1, 1.0f / temp1, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_fire_tail.c", 238), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_fire_tail.c", 238), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (globalCtx->state.frames * -0x14) & 0x1FF, 32, 128)); if (this->rType != 0) { - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D5A0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D5A0); } else { - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); } CLOSE_DISPS(gfxCtx, "../z_eff_fire_tail.c", 273); diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index e1b769f37c..af3b10294c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -83,20 +83,20 @@ void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_g_magma2.c", 282), + gSPSegment(POLY_XLU_DISP++, 0x06, object); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_g_magma2.c", 282), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->rDrawMode == 0) { - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x3D); + POLY_XLU_DISP = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x3D); } else { - oGfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0); + POLY_XLU_DISP = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0); } - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, 0, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, 0, this->rEnvColorA); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, 0, this->rPrimColorA); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, 0, this->rEnvColorA); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_ss_g_magma2.c", 311); } diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 82db2da224..5836daf7c2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -90,14 +90,14 @@ void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, UNK_PT mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); - gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_NOISE); - gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_NOISE); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_g_ripple.c", 247); diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index 50e9035d51..5af3a96934 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -94,12 +94,12 @@ void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } if (1) {} diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index 1f69376fe1..5be471fb30 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -76,17 +76,17 @@ void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 208); if (this->rObjId != -1) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); } Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY); Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 228), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 228), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D18(globalCtx->state.gfxCtx); - gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + gSPDisplayList(POLY_OPA_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_hahen.c", 236); } @@ -100,20 +100,20 @@ void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this) OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 253); if (this->rObjId != -1) { - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); } Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY); Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 271), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 271), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D18(globalCtx->state.gfxCtx); - gDPSetCombineLERP(oGfxCtx->polyOpa.p++, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, + gDPSetCombineLERP(POLY_OPA_DISP++, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 100, 100, 120, 255); - gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + gDPSetPrimColor(POLY_OPA_DISP++, 0x0, 0x01, 100, 100, 120, 255); + gSPDisplayList(POLY_OPA_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_hahen.c", 288); } diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 3e5cebd09f..c6dac726f2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -83,17 +83,17 @@ void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[(this->rType * 8) + (this->rTexIdx)])); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[(this->rType * 8) + (this->rTexIdx)])); func_80094C50(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_hitmark.c", 341); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index d3b69f287e..c863949a57 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -66,15 +66,15 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY); Matrix_RotateX(this->rPitch * 0.0000958738f, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ice_piece.c", 185), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ice_piece.c", 185), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 50, 100, (s32)alpha & 0xFF); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, (s32)alpha & 0xFF); func_8003435C(&this->pos, globalCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (1 * frames) % 256, 0x20, 0x10, 1, 0, (2 * frames) % 256, 0x40, 0x20)); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04033720); + gSPDisplayList(POLY_XLU_DISP++, D_04033720); CLOSE_DISPS(gfxCtx, "../z_eff_ice_piece.c", 209); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index e2bf275a6f..8f20bc8073 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -66,15 +66,15 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) objBankIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_FZ); if ((objBankIdx > -1) && Object_IsLoaded(&globalCtx->objectCtx, objBankIdx)) { - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); func_80093D84(globalCtx->state.gfxCtx); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); - gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_060030A0)); - gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 195, 235, 235, this->rAlpha); + gSPSegment(POLY_XLU_DISP++, 0x06, object); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_060030A0)); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 235, 235, this->rAlpha); gSPSegment( - oGfxCtx->polyXlu.p++, 0x08, + POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->life * 3, this->life * 15, 32, 64, 1, 0, 0, 32, 32)); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); func_800D1FD4(&globalCtx->mf_11DA0); @@ -84,8 +84,8 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_ice_smoke.c", 196); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_06003158)); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06003158)); } } else { this->life = -1; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index bafc33b8bd..b5fbb7fd05 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -55,30 +55,30 @@ void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY); func_80093D84(globalCtx->state.gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, globalCtx->state.frames * this->rScroll, 0x20, 0x80)); if (this->rType >= 100) { - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 0, this->rAlpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 10, 0, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, this->rAlpha); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 10, 0, 0); } else { - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 255, this->rAlpha); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 255, 255, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, this->rAlpha); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 0); } if (1) {} - gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPPipeSync(POLY_XLU_DISP++); func_800D1FD4(&globalCtx->mf_11DA0); if ((index & 1) != 0) { Matrix_RotateY(M_PI, MTXMODE_APPLY); } - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_k_fire.c", 215), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_k_fire.c", 215), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); CLOSE_DISPS(gfxCtx, "../z_eff_k_fire.c", 220); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index b82e71b404..881d7ec15c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -100,9 +100,9 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { if (this->rObjId != KAKERA_OBJECT_DEFAULT) { if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) { - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + gSPSegment(POLY_XLU_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); } else { - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); } } @@ -112,27 +112,27 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) { - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 268), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 268), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); if (colorIdx >= 0) { - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, colors[colorIdx].r, colors[colorIdx].g, colors[colorIdx].b, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, colors[colorIdx].r, colors[colorIdx].g, colors[colorIdx].b, 255); } - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } else { - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 286), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 286), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D18(globalCtx->state.gfxCtx); if (colorIdx >= 0) { - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, colors[colorIdx].r, colors[colorIdx].g, colors[colorIdx].b, + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, colors[colorIdx].r, colors[colorIdx].g, colors[colorIdx].b, 255); } - gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + gSPDisplayList(POLY_OPA_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_kakera.c", 302); diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index 6458987b1f..d0cb0971e2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -98,17 +98,17 @@ void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfRotY, &mfTrans11DA0RotY); SkinMatrix_MtxFMtxFMult(&mfTrans11DA0RotY, &mfScale, &mfResult); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093C14(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, (((s8)((55.0f / this->rLifespan) * this->life) + 200))); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_kirakira.c", 301); diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index 573857d672..69daf2ac58 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -101,18 +101,18 @@ void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfRotate, &mfTrans11DA0Rotate); SkinMatrix_MtxFMtxFMult(&mfTrans11DA0Rotate, &mfScale, &mfResult); - gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { - gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80094C50(gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[texIdx])); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[texIdx])); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(POLY_XLU_DISP++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_lightning.c", 281); diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index e9370732ec..163a341b89 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -70,14 +70,14 @@ void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki.c", 176), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki.c", 176), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D18(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); - gSPSegment(oGfxCtx->polyOpa.p++, 0x08, this->gfx); - gSPDisplayList(oGfxCtx->polyOpa.p++, SEGMENTED_TO_VIRTUAL(D_0401A160)); + gDPSetEnvColor(POLY_OPA_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx); + gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(D_0401A160)); CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki.c", 198); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index a3bba3b6af..d7d75eb806 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -63,14 +63,14 @@ void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki2.c", 171), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki2.c", 171), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D18(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); - gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_0401E2C0)); + gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0401E2C0)); CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki2.c", 198); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index 137768b36f..dc17cdfbef 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -62,12 +62,12 @@ void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Matrix_RotateRPY(0, this->rYaw, globalCtx->state.frames * 10000, MTXMODE_APPLY); } - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stick.c", 176), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stick.c", 176), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D18(gfxCtx); - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); - gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, gCullBackDList); - gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + gSPSegment(POLY_OPA_DISP++, 0x0C, gCullBackDList); + gSPDisplayList(POLY_OPA_DISP++, this->gfx); CLOSE_DISPS(gfxCtx, "../z_eff_ss_stick.c", 188); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index 91d9c491b9..62c4e6836f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -63,14 +63,14 @@ void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { scale = (mfW < 1500.0f) ? 3.0f : (mfW / 1500.0f) * 3.0f; Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stone1.c", 168), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stone1.c", 168), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80094C50(gfxCtx); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(drawParams->texture)); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, drawParams->primColor.r, drawParams->primColor.g, + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(drawParams->texture)); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, drawParams->primColor.r, drawParams->primColor.g, drawParams->primColor.b, 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, drawParams->envColor.r, drawParams->envColor.g, drawParams->envColor.b, 255); - gSPDisplayList(oGfxCtx->polyXlu.p++, D_04029E90); + gDPSetEnvColor(POLY_XLU_DISP++, drawParams->envColor.r, drawParams->envColor.g, drawParams->envColor.b, 255); + gSPDisplayList(POLY_XLU_DISP++, D_04029E90); CLOSE_DISPS(gfxCtx, "../z_eff_ss_stone1.c", 183); } diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 6e34499cb8..1ac0a799d8 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -509,18 +509,18 @@ void Select_DrawMenu(SelectContext* this) { OPEN_DISPS(gfxCtx, "../z_select.c", 930); - gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); SET_FULLSCREEN_VIEWPORT(&this->view); func_800AAA50(&this->view, 0xF); func_80094140(gfxCtx); printer = alloca(sizeof(GfxPrint)); GfxPrint_Init(printer); - GfxPrint_Open(printer, oGfxCtx->polyOpa.p); + GfxPrint_Open(printer, POLY_OPA_DISP); Select_PrintMenu(this, printer); Select_PrintAgeSetting(this, printer, ((void)0, gSaveContext.linkAge)); Select_PrintCutsceneSetting(this, printer, ((void)0, gSaveContext.cutsceneIndex)); - oGfxCtx->polyOpa.p = GfxPrint_Close(printer); + POLY_OPA_DISP = GfxPrint_Close(printer); GfxPrint_Destroy(printer); CLOSE_DISPS(gfxCtx, "../z_select.c", 966); @@ -532,16 +532,16 @@ void Select_DrawLoadingScreen(SelectContext* this) { OPEN_DISPS(gfxCtx, "../z_select.c", 977); - gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); SET_FULLSCREEN_VIEWPORT(&this->view); func_800AAA50(&this->view, 0xF); func_80094140(gfxCtx); printer = alloca(sizeof(GfxPrint)); GfxPrint_Init(printer); - GfxPrint_Open(printer, oGfxCtx->polyOpa.p); + GfxPrint_Open(printer, POLY_OPA_DISP); Select_PrintLoadingMessage(this, printer); - oGfxCtx->polyOpa.p = GfxPrint_Close(printer); + POLY_OPA_DISP = GfxPrint_Close(printer); GfxPrint_Destroy(printer); CLOSE_DISPS(gfxCtx, "../z_select.c", 1006); @@ -552,7 +552,7 @@ void Select_Draw(SelectContext* this) { OPEN_DISPS(gfxCtx, "../z_select.c", 1013); - gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); SET_FULLSCREEN_VIEWPORT(&this->view); func_800AAA50(&this->view, 0xF); diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index d93d4b343f..8a1c6ddfca 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -86,34 +86,34 @@ void Title_Draw(TitleContext* this) { v2.z = 1119.0837; func_8002EABC(&v1, &v2, &v3, this->state.gfxCtx); - gSPSetLights1(oGfxCtx->polyOpa.p++, sTitleLights); + gSPSetLights1(POLY_OPA_DISP++, sTitleLights); Title_SetupView(this, 0, 150.0, 300.0); func_80093D18(this->state.gfxCtx); Matrix_Translate(-53.0, -5.0, 0, MTXMODE_NEW); Matrix_Scale(1.0, 1.0, 1.0, MTXMODE_APPLY); Matrix_RotateRPY(0, sTitleRotY, 0, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(this->state.gfxCtx, "../z_title.c", 424), G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyOpa.p++, &D_01002720); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_title.c", 424), G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, &D_01002720); func_800944C4(this->state.gfxCtx); - gDPPipeSync(oGfxCtx->polyOpa.p++); - gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_2CYCLE); - gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_XLU_SURF2, G_RM_OPA_CI | CVG_DST_WRAP); - gDPSetCombineLERP(oGfxCtx->polyOpa.p++, TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, 0, 0, 0, TEXEL0, PRIMITIVE, + gDPPipeSync(POLY_OPA_DISP++); + gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_XLU_SURF2, G_RM_OPA_CI | CVG_DST_WRAP); + gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, 0, 0, 0, TEXEL0, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0); - gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 170, 255, 255, 255); - gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 255, 128); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 170, 255, 255, 255); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 255, 128); - gDPLoadMultiBlock(oGfxCtx->polyOpa.p++, &D_01001800, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadMultiBlock(POLY_OPA_DISP++, &D_01001800, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11); for (idx = 0, y = 94; idx < 16; idx++, y += 2) { - gDPLoadTextureBlock(oGfxCtx->polyOpa.p++, &D_01000000[0x180 * idx], G_IM_FMT_I, G_IM_SIZ_8b, 192, 2, 0, + gDPLoadTextureBlock(POLY_OPA_DISP++, &D_01000000[0x180 * idx], G_IM_FMT_I, G_IM_SIZ_8b, 192, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPSetTileSize(oGfxCtx->polyOpa.p++, 1, this->uls, (this->ult & 0x7F) - idx * 4, 0, 0); - gSPTextureRectangle(oGfxCtx->polyOpa.p++, 388, y << 2, 1156, (y + 2) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); + gDPSetTileSize(POLY_OPA_DISP++, 1, this->uls, (this->ult & 0x7F) - idx * 4, 0, 0); + gSPTextureRectangle(POLY_OPA_DISP++, 388, y << 2, 1156, (y + 2) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); } func_8007672C(this->state.gfxCtx, 0, 0, 0, (s16)this->coverAlpha, 2); @@ -128,18 +128,18 @@ void Title_Main(GameState* thisx) { OPEN_DISPS(this->state.gfxCtx, "../z_title.c", 494); - gSPSegment(oGfxCtx->polyOpa.p++, 0, NULL); - gSPSegment(oGfxCtx->polyOpa.p++, 1, this->staticSegment); + gSPSegment(POLY_OPA_DISP++, 0, NULL); + gSPSegment(POLY_OPA_DISP++, 1, this->staticSegment); func_80095248(this->state.gfxCtx, 0, 0, 0); Title_Calc(this); Title_Draw(this); if (D_8012DBC0) { - Gfx* gfx = oGfxCtx->polyOpa.p; + Gfx* gfx = POLY_OPA_DISP; s32 pad; Title_PrintBuildInfo(&gfx); - oGfxCtx->polyOpa.p = gfx; + POLY_OPA_DISP = gfx; } if (this->exit) { diff --git a/undefined_syms.txt b/undefined_syms.txt index cb88d48742..b713bdfb32 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -826,6 +826,9 @@ D_0600E630 = 0x0600E630; D_0600F03C = 0x0600F03C; D_0600F8B8 = 0x0600F8B8; +// z_bg_spot11_oasis +D_06000870 = 0x06000870; + // z_bg_mjin D_06000140 = 0x06000140; D_06000330 = 0x06000330; @@ -1015,6 +1018,13 @@ D_06003128 = 0x06003128; D_060042AC = 0x060042AC; D_060059B0 = 0x060059B0; +// z_obj_oshijiki +D_05004E98 = 0x05004E98; +D_05003350 = 0x05003350; +D_05003B50 = 0x05003B50; +D_05004350 = 0x05004350; +D_05004CD0 = 0x05004CD0; + // z_en_goroiwa D_0400D340 = 0x0400D340; @@ -1211,6 +1221,10 @@ D_0600FE40 = 0x0600FE40; D_0400CD80 = 0x0400CD80; D_040184B0 = 0x040184B0; +// z_en_elf +D_04016A48 = 0x04016A48; +D_04014BA4 = 0x04014BA4; + // z_bg_po_syokudai D_060003A0 = 0x060003A0; D_0404D4E0 = 0x0404D4E0; @@ -1274,6 +1288,12 @@ D_06000A3C = 0x06000A3C; D_06000830 = 0x06000830; D_0600040C = 0x0600040C; +//z_bg_jya_bombchuiwa +D_0600E8D0 = 0x0600E8D0; +D_060119B0 = 0x060119B0; +D_0600DC40 = 0x0600DC40; +D_0600DB60 = 0x0600DB60; + // z_en_takara_man D_06004FE0 = 0x06004FE0; D_06000498 = 0x06000498; @@ -1289,6 +1309,11 @@ D_06000B20 = 0x06000B20; D_06000BC0 = 0x06000BC0; D_06001580 = 0x06001580; +// z_Bg_Hidan_Fwbig +D_040173D0 = 0x040173D0; +D_04017BD0 = 0x04017BD0; +D_0600DB20 = 0x0600DB20; + // z_bg_po_event D_06007860 = 0x06007860; D_060075A0 = 0x060075A0; @@ -1316,3 +1341,9 @@ D_060089E0 = 0x060089E0; // z_bg_ddan_jd D_06003CE0 = 0x06003CE0; D_060037B8 = 0x060037B8; + +// z_en_niw +D_06002530 = 0x06002530; +D_060000E8 = 0x060000E8; +D_060023B0 = 0x060023B0; +D_06002428 = 0x06002428;